Integrate StereotypeDisplay branch into master

Change-Id: Ie302a6116a23d743828fb5e5262433daa91a3be9
Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>

356 files changed, 26767 insertions, 25836 deletions

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/icons/EOperation.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/icons/EOperation.gif
new file mode 100644
index 00000000000..60824bba116
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/icons/EOperation.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
index 0683a75d140..925a8991bca 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
@@ -1,108 +1,131 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.nattable.celleditor.configuration">

-      <configuration

-            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig"

-            order="1000">

-      </configuration>

-      <cellAxisConfiguration

-            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleBooleanCellEditorConfiguration"

-            order="1000">

-      </cellAxisConfiguration>

-      <cellAxisConfiguration

-            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleEEnumTypeCellEditorConfiguration"

-            order="1001">

-      </cellAxisConfiguration>

-      <cellAxisConfiguration

-            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleIntegerCellEditorConfiguration"

-            order="1002">

-      </cellAxisConfiguration>

-      <cellAxisConfiguration

-            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleStringCellEditorConfiguration"

-            order="1003">

-      </cellAxisConfiguration>

-   </extension>

- <extension

-         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-      <labelProvider

-            priority="1400"

-            provider="org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.header.labelprovider">

-         </labelProviderContext>

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider">

-         </labelProviderContext>

-      </labelProvider>

-      <labelProvider

-            priority="1500"

-            provider="org.eclipse.papyrus.infra.emf.nattable.provider.EMFEObjectHeaderLabelProvider">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.header.labelprovider">

-         </labelProviderContext>

-      </labelProvider>

-      <labelProvider

-            priority="1300"

-            provider="org.eclipse.papyrus.infra.emf.nattable.provider.TreeFillingFeatureLabelProvider">

-         <labelProviderContext

-               context="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">

-         </labelProviderContext>

-      </labelProvider>

-   </extension>

-	<extension

-       point="org.eclipse.papyrus.infra.nattable.axismanager">

-    <axisManager

-          id="org.eclipse.papyrus.infra.emf.nattable.user.axis.manager"

-          manager="org.eclipse.papyrus.infra.emf.nattable.manager.axis.EObjectAxisManager">

-    </axisManager>

-    <axisManager

-          id="org.eclipse.papyrus.infra.emf.nattable.feature.axis.manager"

-          manager="org.eclipse.papyrus.infra.emf.nattable.manager.axis.EStructuralFeatureAxisManager">

-    </axisManager>

-    <axisManager

-          id="org.eclipse.papyrus.infra.emf.nattable.tree.axis.manager"

-          manager="org.eclipse.papyrus.infra.emf.nattable.manager.axis.EObjectTreeAxisManagerForEventList">

-    </axisManager>

- </extension>

- <extension

-       point="org.eclipse.papyrus.infra.nattable.cellmanager">

-    <cellManager

-          id="org.eclipse.papyrus.infra.emf.nattable.cell.manager"

-          manager="org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFFeatureValueCellManager"

-          order="1000">

-    </cellManager>

- </extension>

- <extension

-       point="org.eclipse.papyrus.infra.nattable.filter.configuration">

-    <configuration

-          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EReferenceFilterRowComboBoxCellEditorConfiguration"

-          order="9000">

-    </configuration>

-    <configuration

-          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EBooleanComboBoxCellEditorFilterConfiguration"

-          order="9000">

-    </configuration>

-    <configuration

-          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EBooleanFilterRowComboBoxCellEditorFilterConfiguration"

-          order="8800">

-    </configuration>

-    <configuration

-          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EReferenceTextEditorFilterConfiguration"

-          order="8900">

-    </configuration>

-    <configuration

-          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EIntegereEditorFilterConfiguration"

-          order="9000">

-    </configuration>

-    <configuration

-          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EDoubleEditorFilterConfiguration"

-          order="9000">

-    </configuration>

-    <configuration

-          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EEnumFilterCellEditorFilterConfiguration"

-          order="8000">

-    </configuration>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.nattable.celleditor.configuration">
+      <configuration
+            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig"
+            order="1000">
+      </configuration>
+      <cellAxisConfiguration
+            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleBooleanCellEditorConfiguration"
+            order="1000">
+      </cellAxisConfiguration>
+      <cellAxisConfiguration
+            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleEEnumTypeCellEditorConfiguration"
+            order="1001">
+      </cellAxisConfiguration>
+      <cellAxisConfiguration
+            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleIntegerCellEditorConfiguration"
+            order="1002">
+      </cellAxisConfiguration>
+      <cellAxisConfiguration
+            class="org.eclipse.papyrus.infra.emf.nattable.celleditor.config.SingleStringCellEditorConfiguration"
+            order="1003">
+      </cellAxisConfiguration>
+   </extension>
+ <extension
+         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">
+      <labelProvider
+            priority="1400"
+            provider="org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider">
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.nattable.header.labelprovider">
+         </labelProviderContext>
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider">
+         </labelProviderContext>
+      </labelProvider>
+      <labelProvider
+            priority="1500"
+            provider="org.eclipse.papyrus.infra.emf.nattable.provider.EMFEObjectHeaderLabelProvider">
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.nattable.header.labelprovider">
+         </labelProviderContext>
+      </labelProvider>
+      <labelProvider
+            priority="1300"
+            provider="org.eclipse.papyrus.infra.emf.nattable.provider.TreeFillingFeatureLabelProvider">
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+         </labelProviderContext>
+      </labelProvider>
+      <labelProvider
+            priority="1401"
+            provider="org.eclipse.papyrus.infra.emf.nattable.provider.EMFEOperationHeaderLabelProvider">
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.nattable.header.treefilling.operation.labelprovider">
+         </labelProviderContext>
+      </labelProvider>
+      <labelProvider
+            priority="1301"
+            provider="org.eclipse.papyrus.infra.emf.nattable.provider.TreeFillingOperationLabelProvider">
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.nattable.header.treefilling.operation.labelprovider">
+         </labelProviderContext>
+      </labelProvider>
+   </extension>
+	<extension
+       point="org.eclipse.papyrus.infra.nattable.axismanager">
+    <axisManager
+          id="org.eclipse.papyrus.infra.emf.nattable.user.axis.manager"
+          manager="org.eclipse.papyrus.infra.emf.nattable.manager.axis.EObjectAxisManager">
+    </axisManager>
+    <axisManager
+          id="org.eclipse.papyrus.infra.emf.nattable.feature.axis.manager"
+          manager="org.eclipse.papyrus.infra.emf.nattable.manager.axis.EStructuralFeatureAxisManager">
+    </axisManager>
+    <axisManager
+          id="org.eclipse.papyrus.infra.emf.nattable.tree.axis.manager"
+          manager="org.eclipse.papyrus.infra.emf.nattable.manager.axis.EObjectTreeAxisManagerForEventList">
+    </axisManager>
+    <axisManager
+          id="org.eclipse.papyrus.infra.emf.nattable.operation.axis.manager"
+          manager="org.eclipse.papyrus.infra.emf.nattable.manager.axis.EOperationAxisManager">
+    </axisManager>
  </extension>
-</plugin>

+ <extension
+       point="org.eclipse.papyrus.infra.nattable.cellmanager">
+    <cellManager
+          id="org.eclipse.papyrus.infra.emf.nattable.cell.manager"
+          manager="org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFFeatureValueCellManager"
+          order="1000">
+    </cellManager>
+    <cellManager
+          id="org.eclipse.papyrus.infra.emf.nattable.cell.operation.manager"
+          manager="org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFOperationValueCellManager"
+          order="1200">
+    </cellManager>
+ </extension>
+ <extension
+       point="org.eclipse.papyrus.infra.nattable.filter.configuration">
+    <configuration
+          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EReferenceFilterRowComboBoxCellEditorConfiguration"
+          order="9000">
+    </configuration>
+    <configuration
+          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EBooleanComboBoxCellEditorFilterConfiguration"
+          order="9000">
+    </configuration>
+    <configuration
+          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EBooleanFilterRowComboBoxCellEditorFilterConfiguration"
+          order="8800">
+    </configuration>
+    <configuration
+          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EReferenceTextEditorFilterConfiguration"
+          order="8900">
+    </configuration>
+    <configuration
+          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EIntegereEditorFilterConfiguration"
+          order="9000">
+    </configuration>
+    <configuration
+          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EDoubleEditorFilterConfiguration"
+          order="9000">
+    </configuration>
+    <configuration
+          class="org.eclipse.papyrus.infra.emf.nattable.filter.configuration.EEnumFilterCellEditorFilterConfiguration"
+          order="8000">
+    </configuration>
+ </extension>
+</plugin>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EOperationAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EOperationAxisManager.java
new file mode 100644
index 00000000000..40818f14b1b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EOperationAxisManager.java
@@ -0,0 +1,174 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

+ * 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:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.emf.nattable.manager.axis;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.Set;

+

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

+import org.eclipse.emf.common.command.UnexecutableCommand;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EOperation;

+import org.eclipse.emf.edit.command.AddCommand;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;

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

+

+/**

+ * @author Céline JANSSENS

+ *

+ */

+public class EOperationAxisManager extends EObjectAxisManager {

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canBeSavedAsConfig()

+	 *

+	 * @return

+	 */

+	@Override

+	public boolean canBeSavedAsConfig() {

+		return true;

+	}

+

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)

+	 *

+	 * @param axisPosition

+	 * @return

+	 */

+	@Override

+	public boolean canDestroyAxisElement(Integer axisPosition) {

+		return false;

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canEditAxisHeader()

+	 *

+	 * @return

+	 */

+	@Override

+	public boolean canEditAxisHeader() {

+		return true;

+	}

+

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAddAxisCommand(TransactionalEditingDomain, java.util.Collection)

+	 *

+	 * @param domain

+	 * @param objectToAdd

+	 * @return

+	 */

+	@Override

+	public Command getAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {

+		final Collection<IAxis> toAdd = new ArrayList<IAxis>();

+		for (final Object current : objectToAdd) {

+			if (isAllowedContents(current) && !isAlreadyManaged(current)) {

+				final EOperationAxis newAxis = NattableaxisFactory.eINSTANCE.createEOperationAxis();

+				newAxis.setElement((EOperation) current);

+				newAxis.setManager(this.representedAxisManager);

+				toAdd.add(newAxis);

+			}

+		}

+		if (!toAdd.isEmpty()) {

+			return AddCommand.create(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), toAdd);

+		}

+		return null;

+	}

+

+

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getComplementaryAddAxisCommand(TransactionalEditingDomain, java.util.Collection)

+	 *

+	 * @param domain

+	 * @param objectToAdd

+	 * @return

+	 */

+	@Override

+	public Command getComplementaryAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {

+		final Set<Object> features = new HashSet<Object>();

+		for (final Object current : objectToAdd) {

+			if (current instanceof EObject) {

+				features.addAll(((EObject) current).eClass().getEAllStructuralFeatures());

+			}

+		}

+		features.removeAll(getElements());

+		if (!features.isEmpty()) {

+			return getAddAxisCommand(domain, features);

+		}

+		return null;

+	}

+

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Integer)

+	 *

+	 * @param domain

+	 * @param axisPosition

+	 * @return

+	 */

+	@Override

+	public Command getDestroyAxisElementCommand(final TransactionalEditingDomain domain, final Integer axisPosition) {

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getElementAxisName(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis)

+	 *

+	 * @param axis

+	 * @return

+	 */

+	@Override

+	public String getElementAxisName(IAxis axis) {

+		if (axis instanceof EOperationAxis) {

+			return ((EOperationAxis) axis).getElement().getName();

+		}

+		return null;

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)

+	 *

+	 * @param object

+	 * @return

+	 */

+	@Override

+	public boolean isAllowedContents(Object object) {

+		return object instanceof EOperation;

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()

+	 *

+	 * @return

+	 */

+	@Override

+	public boolean isSlave() {

+		return true;

+	}

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFOperationValueCellManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFOperationValueCellManager.java
new file mode 100644
index 00000000000..d6bdba3065c
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFOperationValueCellManager.java
@@ -0,0 +1,124 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * 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:
+ *   CEA LIST - Initial API and implementation
+ *   Celine JANSSENS (ALL4TEC) celine.janssens@all4tec.net - Bug 465009 : Allow EOperation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.manager.cell;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+
+/**
+ * 
+ * Cell Manager which allows to get the value of an {@link EOperation} for an {@link EObject}
+ *
+ * @author Céline JANSSENS
+ * 
+ */
+public class EMFOperationValueCellManager extends AbstractCellManager {
+
+	/**
+	 * The not implemented message.
+	 */
+	protected final static String NOT_IMPLEMENTED_MESSAGE = " This Operation target is not implemented "; //$NON-NLS-1$
+
+	/**
+	 * The no parameter message.
+	 */
+	protected final static String NO_PARAMETER_MESSAGE = "N/A: This operation requires some parameters"; //$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#handles(java.lang.Object, java.lang.Object)
+	 *
+	 */
+	@Override
+	public boolean handles(Object columnElement, Object rowElement) {
+		return organizeAndResolvedObjects(columnElement, rowElement, null) != null;
+
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager#doGetValue(java.lang.Object, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 *
+	 */
+	@Override
+	protected Object doGetValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {
+		final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement, null);
+		final EObject eobject = (EObject) objects.get(0);
+		final EOperation operation = (EOperation) objects.get(1);
+		if (eobject.eClass().getEAllOperations().contains(operation)) {
+			try {
+				if (operation.getEParameters().size() != 0) {
+					return NO_PARAMETER_MESSAGE;
+				} else {
+					return eobject.eInvoke(operation, null);
+				}
+			} catch (InvocationTargetException e) {
+				return NOT_IMPLEMENTED_MESSAGE;
+			}
+		}
+		return NOT_AVALAIBLE;
+	}
+
+	/**
+	 *
+	 * @param columnElement
+	 *            the column element
+	 * @param rowElement
+	 *            the row element
+	 * @param sharedMap
+	 *            a map with interesting informations
+	 * @return
+	 *         <code>null</code> or a list of 2 objects.
+	 *         <ul>
+	 *         <li>the first element is the edited EObject</li>
+	 *         <li>the second one is the edited feature</li>
+	 *         </ul>
+	 */
+	protected List<Object> organizeAndResolvedObjects(final Object columnElement, final Object rowElement, Map<?, ?> sharedMap) {
+		List<Object> objects = null;
+		final Object row = AxisUtils.getRepresentedElement(rowElement);
+		final Object column = AxisUtils.getRepresentedElement(columnElement);
+		if (row instanceof EObject && column instanceof EOperation) {
+			objects = new ArrayList<Object>();
+			objects.add(row);
+			objects.add(column);
+		} else if (column instanceof EObject && row instanceof EOperation) {
+			objects = new ArrayList<Object>();
+			objects.add(column);
+			objects.add(row);
+		}
+		return objects;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#isCellEditable(java.lang.Object, java.lang.Object)
+	 *
+	 */
+	@Override
+	public boolean isCellEditable(final Object columnElement, final Object rowElement) {
+		return false;
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEOperationHeaderLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEOperationHeaderLabelProvider.java
new file mode 100644
index 00000000000..5b7d44da9ad
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEOperationHeaderLabelProvider.java
@@ -0,0 +1,297 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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.emf.nattable.provider;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EParameter;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.papyrus.infra.emf.nattable.registry.EOperationImageRegistry;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Provides the label for the EstructuralFeature
+ *
+ * @author Vincent Lorenzo
+ *
+ */
+public class EMFEOperationHeaderLabelProvider extends EMFEObjectHeaderLabelProvider {
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 *         <code>true</code> if we are looking for the label of an EStructuralFeature
+	 */
+	@Override
+	public boolean accept(final Object element) {
+		if (element instanceof ILabelProviderContextElementWrapper) {
+			final Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+			return object instanceof EOperation || object instanceof EOperationAxis;
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @param featureConf
+	 *            the configuration to use to know what display in the label
+	 * @param configRegistry
+	 *            the configRegistry
+	 * @param name
+	 *            the name of the feature
+	 * @param type
+	 *            the type of the feature
+	 * @param lowerBound
+	 *            the lower bound of the feature
+	 * @param upperBounds
+	 *            the upper bound of the feature
+	 * @return
+	 * 		the text to display for the feature according to these informations and the preferences of the user
+	 */
+	protected String getText(final FeatureLabelProviderConfiguration featureConf, final IConfigRegistry configRegistry, final String name, final Object type, final int lowerBound, final int upperBounds) {
+		// we collect the required values
+		boolean displayName = false;
+		try {
+			displayName = featureConf.isDisplayName();
+		} catch (Exception e) {
+			Activator.log.error(e);
+		}
+		boolean displayMultiplicity = featureConf.isDisplayMultiplicity();
+		boolean displayType = featureConf.isDisplayType();
+
+		String displayedText = ""; //$NON-NLS-1$
+		if (displayName) {
+			displayedText += name;
+		}
+		if (displayType) {
+			if (displayName) {
+				displayedText += " : "; //$NON-NLS-1$
+			}
+			displayedText += getTypeName(configRegistry, type);
+		}
+		if (displayMultiplicity) {
+			displayedText += " ["; //$NON-NLS-1$
+			if (upperBounds == -1 && lowerBound <= 1) {
+				displayedText += "*"; //$NON-NLS-1$
+			} else if (lowerBound == upperBounds) {
+				displayedText += Integer.toString(lowerBound);
+			} else {
+				displayedText += Integer.toString(lowerBound);
+				displayedText += ".."; //$NON-NLS-1$
+				if (upperBounds == -1) {
+					displayedText += "*"; //$NON-NLS-1$
+				} else {
+					displayedText += Integer.toString(upperBounds);
+				}
+			}
+			displayedText += "]"; //$NON-NLS-1$
+		}
+
+		return displayedText;
+	}
+
+	/**
+	 *
+	 * @param featureConf
+	 *            the configuration to use to know what display in the label
+	 * @param configRegistry
+	 *            the configRegistry
+	 * @param name
+	 *            the name of the feature
+	 * @param type
+	 *            the type of the feature
+	 * @param lowerBound
+	 *            the lower bound of the feature
+	 * @param upperBounds
+	 *            the upper bound of the feature
+	 * @return
+	 * 		the text to display for the feature according to these informations and the preferences of the user
+	 */
+	protected String getText(final OperationLabelProviderConfiguration featureConf, final IConfigRegistry configRegistry, final String name, final Object type, final int lowerBound, final int upperBounds) {
+		// we collect the required values
+		boolean displayName = false;
+		try {
+			displayName = featureConf.isDisplayName();
+		} catch (Exception e) {
+			Activator.log.error(e);
+		}
+		boolean displayMultiplicity = featureConf.isDisplayMultiplicity();
+		boolean displayType = featureConf.isDisplayType();
+
+		String displayedText = ""; //$NON-NLS-1$
+		if (displayName) {
+			displayedText += name;
+		}
+		if (displayType) {
+			if (displayName) {
+				displayedText += " : "; //$NON-NLS-1$
+			}
+			displayedText += getTypeName(configRegistry, type);
+		}
+		if (displayMultiplicity) {
+			displayedText += " ["; //$NON-NLS-1$
+			if (upperBounds == -1 && lowerBound <= 1) {
+				displayedText += "*"; //$NON-NLS-1$
+			} else if (lowerBound == upperBounds) {
+				displayedText += Integer.toString(lowerBound);
+			} else {
+				displayedText += Integer.toString(lowerBound);
+				displayedText += ".."; //$NON-NLS-1$
+				if (upperBounds == -1) {
+					displayedText += "*"; //$NON-NLS-1$
+				} else {
+					displayedText += Integer.toString(upperBounds);
+				}
+			}
+			displayedText += "]"; //$NON-NLS-1$
+		}
+
+		return displayedText;
+	}
+
+	/**
+	 *
+	 * @param configRegistry
+	 *            the configRegistry
+	 * @param type
+	 *            the type of the feature
+	 * @return
+	 * 		the name to display for the type
+	 */
+	protected String getTypeName(final IConfigRegistry configRegistry, final Object type) {
+		final LabelProviderService serv = getLabelProviderService(configRegistry);
+		if (type instanceof EClassifier) {
+			return ((EClassifier) type).getName();
+		} else {
+			return serv.getLabelProvider(type).getText(type);
+		}
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getText(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public String getText(final Object element) {
+		final ILabelProviderContextElementWrapper wrapper = (ILabelProviderContextElementWrapper) element;
+		final IConfigRegistry configRegistry = wrapper.getConfigRegistry();
+
+		final Object value = getWrappedValue(wrapper);
+		EOperation operation = null;
+		String alias = "";//$NON-NLS-1$
+		if (value instanceof EOperationAxis) {
+			operation = ((EOperationAxis) value).getElement();
+			alias = ((EOperationAxis) value).getAlias();
+		} else if (value instanceof EOperation) {
+			operation = (EOperation) value;
+		}
+
+		String returnedValue = null;
+		if (alias != null && !alias.isEmpty()) {
+			returnedValue = alias;
+		} else {
+			StringBuilder returnedValueBuilder = new StringBuilder(operation.getName());
+			if (!operation.getEParameters().isEmpty()) {
+				returnedValueBuilder.append("("); //$NON-NLS-1$
+				final Iterator<EParameter> parameters = operation.getEParameters().iterator();
+				while (parameters.hasNext()) {
+					final EParameter parameter = parameters.next();
+					returnedValueBuilder.append(parameter.getEType());
+					returnedValueBuilder.append(" "); //$NON-NLS-1$
+					returnedValueBuilder.append(parameter.getName());
+					if (parameters.hasNext()) {
+						returnedValueBuilder.append(", "); //$NON-NLS-1$
+					}
+				}
+				returnedValueBuilder.append(")"); //$NON-NLS-1$
+			} else {
+				returnedValueBuilder.append("()"); //$NON-NLS-1$
+			}
+			returnedValue = returnedValueBuilder.toString();
+		}
+		ILabelProviderConfiguration conf = null;
+		if (wrapper instanceof LabelProviderCellContextElementWrapper) {
+			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) wrapper);
+		}
+		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayLabel()) {
+			returnedValue = ""; //$NON-NLS-1$
+		} else {
+			if (conf instanceof OperationLabelProviderConfiguration) {
+				returnedValue = getText((OperationLabelProviderConfiguration) conf, configRegistry, returnedValue, operation.getEType(), operation.getLowerBound(), operation.getUpperBound());
+			} else if (conf instanceof FeatureLabelProviderConfiguration) {
+				returnedValue = getText((FeatureLabelProviderConfiguration) conf, configRegistry, returnedValue, operation.getEType(), operation.getLowerBound(), operation.getUpperBound());
+			}
+		}
+		return returnedValue;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getImage(java.lang.Object)
+	 *
+	 * @param element
+	 * @return
+	 */
+	@Override
+	public Image getImage(final Object element) {
+		Image result = null;
+		ILabelProviderConfiguration conf = null;
+		if (element instanceof LabelProviderCellContextElementWrapper) {
+			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) element);
+		}
+		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayIcon()) {
+			return null;
+		}
+
+		final Object object = getWrappedValue((ILabelProviderContextElementWrapper) element);
+		EOperation operation = null;
+		if (object instanceof EOperationAxis) {
+			operation = ((EOperationAxis) object).getElement();
+		} else if (object instanceof EOperation) {
+			operation = (EOperation) object;
+		}
+		if (null != operation) {
+			result = EOperationImageRegistry.getOperationIcon();
+		}
+		return result;
+	}
+
+	/**
+	 * @param wrapper
+	 * @return
+	 * 		the wrapped value to use to calculate the label
+	 */
+	protected Object getWrappedValue(final ILabelProviderContextElementWrapper wrapper) {
+		return wrapper.getObject();
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/TreeFillingOperationLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/TreeFillingOperationLabelProvider.java
new file mode 100644
index 00000000000..fa00e2f8a3b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/TreeFillingOperationLabelProvider.java
@@ -0,0 +1,85 @@
+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.emf.nattable.provider;
+
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
+
+/**
+ * The label provider for the tree filling operation
+ */
+public class TreeFillingOperationLabelProvider extends EMFEOperationHeaderLabelProvider {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#accept(java.lang.Object)
+	 */
+	@Override
+	public boolean accept(final Object element) {
+		boolean result = false;
+		if (element instanceof ILabelProviderContextElementWrapper) {
+			final Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+			if (object instanceof ITreeItemAxis) {
+				ITreeItemAxis curr = (ITreeItemAxis) object;
+				Object el = curr.getElement();
+				if (el instanceof TreeFillingConfiguration) {
+					final IAxis axis = ((TreeFillingConfiguration) el).getAxisUsedAsAxisProvider();
+					result = axis instanceof EOperation || axis instanceof EOperationAxis;
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getLabelConfiguration(org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper)
+	 */
+	@Override
+	protected ILabelProviderConfiguration getLabelConfiguration(final LabelProviderCellContextElementWrapper element) {
+		ILabelProviderConfiguration result = null;
+		if (element instanceof ILabelProviderContextElementWrapper) {
+			final Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+			if (object instanceof IAxis && ((IAxis) object).getElement() instanceof TreeFillingConfiguration) {
+				result = ((TreeFillingConfiguration) ((IAxis) object).getElement()).getLabelProvider();
+			}
+		}
+		return result;
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFEOperationHeaderLabelProvider#getWrappedValue(org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper)
+	 */
+	@Override
+	protected Object getWrappedValue(final ILabelProviderContextElementWrapper wrapper) {
+		Object result = null;
+		Object value = wrapper.getObject();
+		if (value instanceof IAxis && ((IAxis) value).getElement() instanceof TreeFillingConfiguration) {
+			result = ((TreeFillingConfiguration) ((IAxis) value).getElement()).getAxisUsedAsAxisProvider();
+		}
+		return null != result ? result : super.getWrappedValue(wrapper);
+	}
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EOperationImageRegistry.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EOperationImageRegistry.java
new file mode 100644
index 00000000000..281beb56742
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EOperationImageRegistry.java
@@ -0,0 +1,50 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.nattable.registry;
+
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Image registry to use for EOperation
+ */
+public class EOperationImageRegistry {
+
+	/**
+	 * The EOperation icon path.
+	 */
+	private static final String OPERATION_ICON_PATH = "/icons/EOperation.gif"; //$NON-NLS-1$
+
+	/**
+	 * This allow to get the image.
+	 *
+	 * @param path
+	 *            a path.
+	 * @return
+	 *         the image loaded from this path.
+	 */
+	private static final Image getImage(final String path) {
+		return Activator.getDefault().getImage(org.eclipse.papyrus.infra.emf.nattable.Activator.PLUGIN_ID, path);
+	}
+
+	/**
+	 * Get the operation icon.
+	 *
+	 * @return
+	 *         the operation icon.
+	 */
+	public static Image getOperationIcon() {
+		return EOperationImageRegistry.getImage(OPERATION_ICON_PATH);
+	}
+}
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 6032c495d66..f51b0f9880c 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
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,

  org.eclipse.emf.ecore;visibility:=reexport,

  org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0"

+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0";visibility:=reexport

 Export-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider,

  org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider,

  org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider,

@@ -20,10 +20,8 @@ Bundle-ClassPath: .
 Bundle-Version: 1.1.0.qualifier

 Bundle-Localization: plugin

 Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.pr

- ovider.NattableEditPlugin$Implementation

+Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin$Implementation

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.edit;sin

- gleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.edit;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Bundle-Description: %pluginDescription

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_OperationLabelProviderConfiguration.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_OperationLabelProviderConfiguration.gif
new file mode 100644
index 00000000000..5ef0e324111
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_OperationLabelProviderConfiguration.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EOperationAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EOperationAxis.gif
new file mode 100644
index 00000000000..af9f8184d24
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EOperationAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EOperationTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EOperationTreeItemAxis.gif
new file mode 100644
index 00000000000..5da9e2dfa83
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EOperationTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_OperationTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_OperationTreeItemAxis.gif
new file mode 100644
index 00000000000..4699e94d909
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_OperationTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateObjectAxis_localLabelConfiguration_OperationLabelProviderConfiguration.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateObjectAxis_localLabelConfiguration_OperationLabelProviderConfiguration.gif
new file mode 100644
index 00000000000..55993902052
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateObjectAxis_localLabelConfiguration_OperationLabelProviderConfiguration.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateOperationAxis_localLabelConfiguration_OperationLabelProviderConfiguration.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateOperationAxis_localLabelConfiguration_OperationLabelProviderConfiguration.gif
new file mode 100644
index 00000000000..b29986ed49f
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateOperationAxis_localLabelConfiguration_OperationLabelProviderConfiguration.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTreeFillingConfiguration_axisUsedAsAxisProvider_EOperationAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTreeFillingConfiguration_axisUsedAsAxisProvider_EOperationAxis.gif
new file mode 100644
index 00000000000..8712376bfbf
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTreeFillingConfiguration_axisUsedAsAxisProvider_EOperationAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTreeFillingConfiguration_axisUsedAsAxisProvider_EOperationTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTreeFillingConfiguration_axisUsedAsAxisProvider_EOperationTreeItemAxis.gif
new file mode 100644
index 00000000000..8986a1bfdb8
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTreeFillingConfiguration_axisUsedAsAxisProvider_EOperationTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTreeFillingConfiguration_axisUsedAsAxisProvider_OperationTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTreeFillingConfiguration_axisUsedAsAxisProvider_OperationTreeItemAxis.gif
new file mode 100644
index 00000000000..935ff3b5b4b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTreeFillingConfiguration_axisUsedAsAxisProvider_OperationTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EOperationAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EOperationAxis.gif
new file mode 100644
index 00000000000..c414fe9f728
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EOperationAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EOperationTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EOperationTreeItemAxis.gif
new file mode 100644
index 00000000000..7b7c428c715
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EOperationTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/OperationLabelProviderConfiguration.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/OperationLabelProviderConfiguration.gif
new file mode 100644
index 00000000000..7bac4fd3808
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/OperationLabelProviderConfiguration.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/OperationTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/OperationTreeItemAxis.gif
new file mode 100644
index 00000000000..739ebbfa6ac
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/OperationTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
index a95842cb39d..2d576fd3529 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
@@ -224,3 +224,14 @@ _UI_EObjectValueStyle_eObjectValue_feature = EObject Value
 _UI_EObjectListValueStyle_eObjectValue_feature = EObject Value

 

 pluginDescription=This plugin provides the metamodel used by the nattable editor.
+

+_UI_OperationLabelProviderConfiguration_type = Operation Label Provider Configuration

+_UI_OperationAxis_type = Operation Axis

+_UI_OperationTreeItemAxis_type = Operation Tree Item Axis

+_UI_EOperationAxis_type = EOperation Axis

+_UI_EOperationTreeItemAxis_type = EOperation Tree Item Axis

+_UI_OperationLabelProviderConfiguration_displayType_feature = Display Type

+_UI_OperationLabelProviderConfiguration_displayMultiplicity_feature = Display Multiplicity

+_UI_OperationLabelProviderConfiguration_displayName_feature = Display Name

+_UI_OperationAxis_localLabelConfiguration_feature = Local Label Configuration

+_UI_EOperationAxis_element_feature = Element

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java
index 60050945ae3..f08f527589a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/AxisGroupItemProvider.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup} object.

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

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

- * 

  * @generated

  */

 public class AxisGroupItemProvider extends StyledElementItemProvider {

@@ -40,7 +39,6 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public AxisGroupItemProvider(AdapterFactory adapterFactory) {

@@ -51,7 +49,6 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -70,76 +67,72 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
 	 * This adds a property descriptor for the Manager feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addManagerPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.IAXIS__MANAGER,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.IAXIS__MANAGER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Alias feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addAliasPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.IAXIS__ALIAS,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.IAXIS__ALIAS,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

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

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addGroupedAxisPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_AxisGroup_groupedAxis_feature", "_UI_AxisGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.AXIS_GROUP__GROUPED_AXIS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisGroup_groupedAxis_feature", "_UI_AxisGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.AXIS_GROUP__GROUPED_AXIS,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns AxisGroup.gif.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -151,15 +144,14 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((AxisGroup) object).getAlias();

+		String label = ((AxisGroup)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -168,7 +160,6 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -176,9 +167,9 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.AXIS_GROUP__ALIAS:

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

-			return;

+			case NattableaxisPackage.AXIS_GROUP__ALIAS:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -188,7 +179,6 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -200,7 +190,6 @@ public class AxisGroupItemProvider extends StyledElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java
index 3ad77d76594..17ccbee6927 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java
@@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis} object.

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

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

- * 

  * @generated

  */

 public class EObjectAxisItemProvider extends ObjectAxisItemProvider {

@@ -35,7 +34,6 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public EObjectAxisItemProvider(AdapterFactory adapterFactory) {

@@ -46,7 +44,6 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -63,30 +60,28 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
 	 * This adds a property descriptor for the Element feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addElementPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_EObjectAxis_element_feature", "_UI_EObjectAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.EOBJECT_AXIS__ELEMENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectAxis_element_feature", "_UI_EObjectAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.EOBJECT_AXIS__ELEMENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns EObjectAxis.gif.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -98,15 +93,14 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((EObjectAxis) object).getAlias();

+		String label = ((EObjectAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -115,7 +109,6 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -129,7 +122,6 @@ public class EObjectAxisItemProvider extends ObjectAxisItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java
index c2fab537354..ff17d5bbd02 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectTreeItemAxisItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis} object.

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

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

- * 

  * @generated

  */

 public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {

@@ -37,7 +36,6 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public EObjectTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -67,76 +64,72 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
 	 * This adds a property descriptor for the Parent feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addParentPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Expanded feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addExpandedPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Children feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addChildrenPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns EObjectTreeItemAxis.gif.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -148,15 +141,14 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((EObjectTreeItemAxis) object).getAlias();

+		String label = ((EObjectTreeItemAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -165,7 +157,6 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,9 +164,9 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

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

-			return;

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -185,7 +176,6 @@ public class EObjectTreeItemAxisItemProvider extends EObjectAxisItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationAxisItemProvider.java
new file mode 100644
index 00000000000..6cc120beadc
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationAxisItemProvider.java
@@ -0,0 +1,134 @@
+/**

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

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

+

+/**

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

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

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

+ * @generated

+ */

+public class EOperationAxisItemProvider extends OperationAxisItemProvider {

+	/**

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

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

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

+	 * @generated

+	 */

+	public EOperationAxisItemProvider(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);

+

+			addElementPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

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

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

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

+	 * @generated

+	 */

+	protected void addElementPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_EOperationAxis_element_feature", "_UI_EOperationAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.EOPERATION_AXIS__ELEMENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This returns EOperationAxis.gif.

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

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

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EOperationAxis")); //$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 = ((EOperationAxis)object).getAlias();

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

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

+			getString("_UI_EOperationAxis_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);

+		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/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationTreeItemAxisItemProvider.java
new file mode 100644
index 00000000000..c7311fa918c
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EOperationTreeItemAxisItemProvider.java
@@ -0,0 +1,188 @@
+/**

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

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

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

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

+

+/**

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

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

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

+ * @generated

+ */

+public class EOperationTreeItemAxisItemProvider extends EOperationAxisItemProvider {

+	/**

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

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

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

+	 * @generated

+	 */

+	public EOperationTreeItemAxisItemProvider(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);

+

+			addParentPropertyDescriptor(object);

+			addExpandedPropertyDescriptor(object);

+			addChildrenPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

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

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

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

+	 * @generated

+	 */

+	protected void addParentPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

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

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

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

+	 * @generated

+	 */

+	protected void addExpandedPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

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

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

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

+	 * @generated

+	 */

+	protected void addChildrenPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This returns EOperationTreeItemAxis.gif.

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

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

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EOperationTreeItemAxis")); //$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 = ((EOperationTreeItemAxis)object).getAlias();

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

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

+			getString("_UI_EOperationTreeItemAxis_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(EOperationTreeItemAxis.class)) {

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:

+				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/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java
index f92406af44a..61048e4a08d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java
@@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis} object.

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

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

- * 

  * @generated

  */

 public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider {

@@ -35,7 +34,6 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public EStructuralFeatureAxisItemProvider(AdapterFactory adapterFactory) {

@@ -46,7 +44,6 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -63,30 +60,28 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
 	 * This adds a property descriptor for the Element feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addElementPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeatureAxis_element_feature", "_UI_EStructuralFeatureAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_AXIS__ELEMENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeatureAxis_element_feature", "_UI_EStructuralFeatureAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ESTRUCTURAL_FEATURE_AXIS__ELEMENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns EStructuralFeatureAxis.gif.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -98,15 +93,14 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((EStructuralFeatureAxis) object).getAlias();

+		String label = ((EStructuralFeatureAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -115,7 +109,6 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -129,7 +122,6 @@ public class EStructuralFeatureAxisItemProvider extends FeatureAxisItemProvider
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java
index 8da6b6e8c8a..568383e6e94 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureTreeItemAxisItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis} object.

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

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

- * 

  * @generated

  */

 public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatureAxisItemProvider {

@@ -37,7 +36,6 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public EStructuralFeatureTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -67,76 +64,72 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
 	 * This adds a property descriptor for the Parent feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addParentPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Expanded feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addExpandedPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Children feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addChildrenPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns EStructuralFeatureTreeItemAxis.gif.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -148,15 +141,14 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((EStructuralFeatureTreeItemAxis) object).getAlias();

+		String label = ((EStructuralFeatureTreeItemAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -165,7 +157,6 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,9 +164,9 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

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

-			return;

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -185,7 +176,6 @@ public class EStructuralFeatureTreeItemAxisItemProvider extends EStructuralFeatu
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
index e29fd03c9a1..712ba4b4660 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
@@ -34,7 +34,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis} object.

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

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

- * 

  * @generated

  */

 public class FeatureAxisItemProvider extends StyledElementItemProvider {

@@ -42,7 +41,6 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public FeatureAxisItemProvider(AdapterFactory adapterFactory) {

@@ -53,7 +51,6 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -71,54 +68,52 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
 	 * This adds a property descriptor for the Manager feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addManagerPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.IAXIS__MANAGER,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.IAXIS__MANAGER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Alias feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addAliasPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.IAXIS__ALIAS,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.IAXIS__ALIAS,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

-	 * 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

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

 	 */

 	@Override

@@ -133,7 +128,6 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -148,15 +142,14 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((FeatureAxis) object).getAlias();

+		String label = ((FeatureAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -165,7 +158,6 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,12 +165,12 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.FEATURE_AXIS__ALIAS:

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

-			return;

-		case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

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

-			return;

+			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

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

+				return;

+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -188,7 +180,6 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -196,16 +187,15 @@ public class FeatureAxisItemProvider extends StyledElementItemProvider {
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,

-						NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

 	}

 

 	/**

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

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java
index b8d9c460b00..8f081f1018e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis} object.

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

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

- * 

  * @generated

  */

 public class FeatureIdAxisItemProvider extends IdAxisItemProvider {

@@ -37,7 +36,6 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public FeatureIdAxisItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -61,11 +58,11 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
 	}

 

 	/**

-	 * 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

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

 	 */

 	@Override

@@ -80,7 +77,6 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -95,7 +91,6 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
 	 * This returns FeatureIdAxis.gif.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -107,15 +102,14 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((FeatureIdAxis) object).getAlias();

+		String label = ((FeatureIdAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -124,7 +118,6 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -132,9 +125,9 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

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

-			return;

+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -144,7 +137,6 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -152,9 +144,9 @@ public class FeatureIdAxisItemProvider extends IdAxisItemProvider {
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,

-						NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java
index cc0387493cc..4db208141ae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdTreeItemAxisItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis} object.

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

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

- * 

  * @generated

  */

 public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider {

@@ -37,7 +36,6 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public FeatureIdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -67,76 +64,72 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
 	 * This adds a property descriptor for the Parent feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addParentPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Expanded feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addExpandedPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Children feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addChildrenPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns FeatureIdTreeItemAxis.gif.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -148,15 +141,14 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((FeatureIdTreeItemAxis) object).getAlias();

+		String label = ((FeatureIdTreeItemAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -165,7 +157,6 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,9 +164,9 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

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

-			return;

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -185,7 +176,6 @@ public class FeatureIdTreeItemAxisItemProvider extends FeatureIdAxisItemProvider
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java
index e412d115df3..7057c86f26e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureTreeItemAxisItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis} object.

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

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

- * 

  * @generated

  */

 public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {

@@ -37,7 +36,6 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public FeatureTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -67,96 +64,80 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
 	 * This adds a property descriptor for the Parent feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addParentPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Expanded feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addExpandedPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Children feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addChildrenPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns FeatureTreeItemAxis.gif.

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

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

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((FeatureTreeItemAxis) object).getAlias();

+		String label = ((FeatureTreeItemAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -165,7 +146,6 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,9 +153,9 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

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

-			return;

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -185,7 +165,6 @@ public class FeatureTreeItemAxisItemProvider extends FeatureAxisItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
index 001803ea856..c7217600102 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis} object.

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

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

- * 

  * @generated

  */

 public class IdAxisItemProvider extends StyledElementItemProvider {

@@ -40,7 +39,6 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public IdAxisItemProvider(AdapterFactory adapterFactory) {

@@ -51,7 +49,6 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -70,84 +67,80 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
 	 * This adds a property descriptor for the Manager feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addManagerPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.IAXIS__MANAGER,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.IAXIS__MANAGER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Alias feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addAliasPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.IAXIS__ALIAS,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.IAXIS__ALIAS,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Element feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addElementPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_IdAxis_element_feature", "_UI_IdAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ID_AXIS__ELEMENT,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_IdAxis_element_feature", "_UI_IdAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ID_AXIS__ELEMENT,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((IdAxis) object).getAlias();

+		String label = ((IdAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -156,7 +149,6 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -164,10 +156,10 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.ID_AXIS__ALIAS:

-		case NattableaxisPackage.ID_AXIS__ELEMENT:

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

-			return;

+			case NattableaxisPackage.ID_AXIS__ALIAS:

+			case NattableaxisPackage.ID_AXIS__ELEMENT:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -177,7 +169,6 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -189,7 +180,6 @@ public class IdAxisItemProvider extends StyledElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java
index 3a310f6ea75..51a4fb44f30 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdTreeItemAxisItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis} object.

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

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

- * 

  * @generated

  */

 public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {

@@ -37,7 +36,6 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public IdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -67,76 +64,72 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
 	 * This adds a property descriptor for the Parent feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addParentPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Expanded feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addExpandedPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Children feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addChildrenPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns IdTreeItemAxis.gif.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -148,15 +141,14 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((IdTreeItemAxis) object).getAlias();

+		String label = ((IdTreeItemAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -165,7 +157,6 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,9 +164,9 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

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

-			return;

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -185,7 +176,6 @@ public class IdTreeItemAxisItemProvider extends IdAxisItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
index 72b73f3d3c2..9c3dc0d0b83 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.util.Natta
  * Note that most of the adapters are shared among multiple instances.

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

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

- * 

  * @generated

  */

 public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +45,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

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

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

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -55,7 +53,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

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

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

-	 * 

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -64,7 +61,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

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

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

-	 * 

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -73,7 +69,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This constructs an instance.

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

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

-	 * 

 	 * @generated

 	 */

 	public NattableaxisItemProviderAdapterFactory() {

@@ -88,7 +83,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis} instances.

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

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

-	 * 

 	 * @generated

 	 */

 	protected IdTreeItemAxisItemProvider idTreeItemAxisItemProvider;

@@ -97,7 +91,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -113,7 +106,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis} instances.

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

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

-	 * 

 	 * @generated

 	 */

 	protected EObjectAxisItemProvider eObjectAxisItemProvider;

@@ -122,7 +114,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -138,7 +129,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis} instances.

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

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

-	 * 

 	 * @generated

 	 */

 	protected EObjectTreeItemAxisItemProvider eObjectTreeItemAxisItemProvider;

@@ -147,7 +137,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -160,160 +149,147 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	}

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

-	protected FeatureTreeItemAxisItemProvider featureTreeItemAxisItemProvider;

+	protected FeatureIdAxisItemProvider featureIdAxisItemProvider;

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

-	public Adapter createFeatureTreeItemAxisAdapter() {

-		if (featureTreeItemAxisItemProvider == null) {

-			featureTreeItemAxisItemProvider = new FeatureTreeItemAxisItemProvider(this);

+	public Adapter createFeatureIdAxisAdapter() {

+		if (featureIdAxisItemProvider == null) {

+			featureIdAxisItemProvider = new FeatureIdAxisItemProvider(this);

 		}

 

-		return featureTreeItemAxisItemProvider;

+		return featureIdAxisItemProvider;

 	}

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

-	protected ObjectTreeItemAxisItemProvider objectTreeItemAxisItemProvider;

+	protected FeatureIdTreeItemAxisItemProvider featureIdTreeItemAxisItemProvider;

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

-	public Adapter createObjectTreeItemAxisAdapter() {

-		if (objectTreeItemAxisItemProvider == null) {

-			objectTreeItemAxisItemProvider = new ObjectTreeItemAxisItemProvider(this);

+	public Adapter createFeatureIdTreeItemAxisAdapter() {

+		if (featureIdTreeItemAxisItemProvider == null) {

+			featureIdTreeItemAxisItemProvider = new FeatureIdTreeItemAxisItemProvider(this);

 		}

 

-		return objectTreeItemAxisItemProvider;

+		return featureIdTreeItemAxisItemProvider;

 	}

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

-	protected FeatureIdAxisItemProvider featureIdAxisItemProvider;

+	protected EStructuralFeatureAxisItemProvider eStructuralFeatureAxisItemProvider;

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

-	public Adapter createFeatureIdAxisAdapter() {

-		if (featureIdAxisItemProvider == null) {

-			featureIdAxisItemProvider = new FeatureIdAxisItemProvider(this);

+	public Adapter createEStructuralFeatureAxisAdapter() {

+		if (eStructuralFeatureAxisItemProvider == null) {

+			eStructuralFeatureAxisItemProvider = new EStructuralFeatureAxisItemProvider(this);

 		}

 

-		return featureIdAxisItemProvider;

+		return eStructuralFeatureAxisItemProvider;

 	}

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

-	protected FeatureIdTreeItemAxisItemProvider featureIdTreeItemAxisItemProvider;

+	protected EOperationAxisItemProvider eOperationAxisItemProvider;

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

-	public Adapter createFeatureIdTreeItemAxisAdapter() {

-		if (featureIdTreeItemAxisItemProvider == null) {

-			featureIdTreeItemAxisItemProvider = new FeatureIdTreeItemAxisItemProvider(this);

+	public Adapter createEOperationAxisAdapter() {

+		if (eOperationAxisItemProvider == null) {

+			eOperationAxisItemProvider = new EOperationAxisItemProvider(this);

 		}

 

-		return featureIdTreeItemAxisItemProvider;

+		return eOperationAxisItemProvider;

 	}

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

-	protected EStructuralFeatureAxisItemProvider eStructuralFeatureAxisItemProvider;

+	protected EStructuralFeatureTreeItemAxisItemProvider eStructuralFeatureTreeItemAxisItemProvider;

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

-	public Adapter createEStructuralFeatureAxisAdapter() {

-		if (eStructuralFeatureAxisItemProvider == null) {

-			eStructuralFeatureAxisItemProvider = new EStructuralFeatureAxisItemProvider(this);

+	public Adapter createEStructuralFeatureTreeItemAxisAdapter() {

+		if (eStructuralFeatureTreeItemAxisItemProvider == null) {

+			eStructuralFeatureTreeItemAxisItemProvider = new EStructuralFeatureTreeItemAxisItemProvider(this);

 		}

 

-		return eStructuralFeatureAxisItemProvider;

+		return eStructuralFeatureTreeItemAxisItemProvider;

 	}

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

-	protected EStructuralFeatureTreeItemAxisItemProvider eStructuralFeatureTreeItemAxisItemProvider;

+	protected EOperationTreeItemAxisItemProvider eOperationTreeItemAxisItemProvider;

 

 	/**

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

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

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

-	public Adapter createEStructuralFeatureTreeItemAxisAdapter() {

-		if (eStructuralFeatureTreeItemAxisItemProvider == null) {

-			eStructuralFeatureTreeItemAxisItemProvider = new EStructuralFeatureTreeItemAxisItemProvider(this);

+	public Adapter createEOperationTreeItemAxisAdapter() {

+		if (eOperationTreeItemAxisItemProvider == null) {

+			eOperationTreeItemAxisItemProvider = new EOperationTreeItemAxisItemProvider(this);

 		}

 

-		return eStructuralFeatureTreeItemAxisItemProvider;

+		return eOperationTreeItemAxisItemProvider;

 	}

 

 	/**

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

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

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

-	 * 

 	 * @generated

 	 */

 	protected ObjectIdAxisItemProvider objectIdAxisItemProvider;

@@ -322,7 +298,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -338,7 +313,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis} instances.

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

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

-	 * 

 	 * @generated

 	 */

 	protected ObjectIdTreeItemAxisItemProvider objectIdTreeItemAxisItemProvider;

@@ -347,7 +321,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -363,7 +336,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup} instances.

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

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

-	 * 

 	 * @generated

 	 */

 	protected AxisGroupItemProvider axisGroupItemProvider;

@@ -372,7 +344,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -388,7 +359,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This returns the root adapter factory that contains this factory.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -400,7 +370,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This sets the composed adapter factory that contains this factory.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -411,7 +380,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -423,7 +391,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This implementation substitutes the factory itself as the key for the adapter.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -434,14 +401,13 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

 		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -453,7 +419,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This adds a listener.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -465,7 +430,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This removes a listener.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -477,7 +441,6 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -490,38 +453,25 @@ public class NattableaxisItemProviderAdapterFactory extends NattableaxisAdapterF
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory.

+	 * This disposes all of the item providers created by this factory. 

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void dispose() {

-		if (idTreeItemAxisItemProvider != null)

-			idTreeItemAxisItemProvider.dispose();

-		if (eObjectAxisItemProvider != null)

-			eObjectAxisItemProvider.dispose();

-		if (eObjectTreeItemAxisItemProvider != null)

-			eObjectTreeItemAxisItemProvider.dispose();

-		if (featureTreeItemAxisItemProvider != null)

-			featureTreeItemAxisItemProvider.dispose();

-		if (objectTreeItemAxisItemProvider != null)

-			objectTreeItemAxisItemProvider.dispose();

-		if (featureIdAxisItemProvider != null)

-			featureIdAxisItemProvider.dispose();

-		if (featureIdTreeItemAxisItemProvider != null)

-			featureIdTreeItemAxisItemProvider.dispose();

-		if (eStructuralFeatureAxisItemProvider != null)

-			eStructuralFeatureAxisItemProvider.dispose();

-		if (eStructuralFeatureTreeItemAxisItemProvider != null)

-			eStructuralFeatureTreeItemAxisItemProvider.dispose();

-		if (objectIdAxisItemProvider != null)

-			objectIdAxisItemProvider.dispose();

-		if (objectIdTreeItemAxisItemProvider != null)

-			objectIdTreeItemAxisItemProvider.dispose();

-		if (axisGroupItemProvider != null)

-			axisGroupItemProvider.dispose();

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

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

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

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

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

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

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

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

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

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

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

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

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
index 251a2ccbfda..9405cbb3c8b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
@@ -34,7 +34,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis} object.

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

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

- * 

  * @generated

  */

 public class ObjectAxisItemProvider extends StyledElementItemProvider {

@@ -42,7 +41,6 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public ObjectAxisItemProvider(AdapterFactory adapterFactory) {

@@ -53,7 +51,6 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -71,54 +68,52 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
 	 * This adds a property descriptor for the Manager feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addManagerPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.IAXIS__MANAGER,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.IAXIS__MANAGER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Alias feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addAliasPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.IAXIS__ALIAS,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.IAXIS__ALIAS,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

-	 * 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

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

 	 */

 	@Override

@@ -133,7 +128,6 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -148,15 +142,14 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((ObjectAxis) object).getAlias();

+		String label = ((ObjectAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -165,7 +158,6 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,12 +165,12 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.OBJECT_AXIS__ALIAS:

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

-			return;

-		case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

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

-			return;

+			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

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

+				return;

+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -188,7 +180,6 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -196,21 +187,25 @@ public class ObjectAxisItemProvider extends StyledElementItemProvider {
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-						NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

+				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-						NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

+

+		newChildDescriptors.add

+			(createChildParameter

+				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

+				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));

 	}

 

 	/**

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

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java
index 8cdc03a1353..7affb62befd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis} object.

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

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

- * 

  * @generated

  */

 public class ObjectIdAxisItemProvider extends IdAxisItemProvider {

@@ -37,7 +36,6 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public ObjectIdAxisItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -61,11 +58,11 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
 	}

 

 	/**

-	 * 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

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

 	 */

 	@Override

@@ -80,7 +77,6 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -95,7 +91,6 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
 	 * This returns ObjectIdAxis.gif.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -107,15 +102,14 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((ObjectIdAxis) object).getAlias();

+		String label = ((ObjectIdAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -124,7 +118,6 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -132,9 +125,9 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

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

-			return;

+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -144,7 +137,6 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -152,14 +144,19 @@ public class ObjectIdAxisItemProvider extends IdAxisItemProvider {
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-						NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

+				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-						NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

+

+		newChildDescriptors.add

+			(createChildParameter

+				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

+				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java
index 8e90758fc43..4f995133542 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdTreeItemAxisItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTr
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis} object.

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

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

- * 

  * @generated

  */

 public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {

@@ -37,7 +36,6 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public ObjectIdTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -67,76 +64,72 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
 	 * This adds a property descriptor for the Parent feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addParentPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Expanded feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addExpandedPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Children feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addChildrenPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns ObjectIdTreeItemAxis.gif.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -148,15 +141,14 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((ObjectIdTreeItemAxis) object).getAlias();

+		String label = ((ObjectIdTreeItemAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -165,7 +157,6 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,9 +164,9 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

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

-			return;

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -185,7 +176,6 @@ public class ObjectIdTreeItemAxisItemProvider extends ObjectIdAxisItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java
index 443608e9c96..2282e6f0a39 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectTreeItemAxisItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTree
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis} object.

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

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

- * 

  * @generated

  */

 public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {

@@ -37,7 +36,6 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public ObjectTreeItemAxisItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -67,96 +64,80 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
 	 * This adds a property descriptor for the Parent feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addParentPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Expanded feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addExpandedPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Children feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addChildrenPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

-	}

-

-	/**

-	 * This returns ObjectTreeItemAxis.gif.

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

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

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

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

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((ObjectTreeItemAxis) object).getAlias();

+		String label = ((ObjectTreeItemAxis)object).getAlias();

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

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

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

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

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

 	}

 

 

@@ -165,7 +146,6 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,9 +153,9 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
 		updateChildren(notification);

 

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

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

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

-			return;

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

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

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -185,7 +165,6 @@ public class ObjectTreeItemAxisItemProvider extends ObjectAxisItemProvider {
 	 * that can be created under this object.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationAxisItemProvider.java
new file mode 100644
index 00000000000..c06c60353eb
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationAxisItemProvider.java
@@ -0,0 +1,213 @@
+/**

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

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis;

+

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

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.provider.StyledElementItemProvider;

+

+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.nattableaxis.OperationAxis} object.

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

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

+ * @generated

+ */

+public class OperationAxisItemProvider extends StyledElementItemProvider {

+	/**

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

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

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

+	 * @generated

+	 */

+	public OperationAxisItemProvider(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);

+

+			addManagerPropertyDescriptor(object);

+			addAliasPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

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

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

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

+	 * @generated

+	 */

+	protected void addManagerPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.IAXIS__MANAGER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

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

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

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

+	 * @generated

+	 */

+	protected void addAliasPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.IAXIS__ALIAS,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

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

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if (childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(NattableaxisPackage.Literals.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION);

+		}

+		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 the label text for the adapted class.

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

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

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((OperationAxis)object).getAlias();

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

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

+			getString("_UI_OperationAxis_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(OperationAxis.class)) {

+			case NattableaxisPackage.OPERATION_AXIS__ALIAS:

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

+				return;

+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

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

+				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);

+

+		newChildDescriptors.add

+			(createChildParameter

+				(NattableaxisPackage.Literals.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION,

+				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));

+	}

+

+	/**

+	 * 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/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationTreeItemAxisItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationTreeItemAxisItemProvider.java
new file mode 100644
index 00000000000..210d12b924a
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/OperationTreeItemAxisItemProvider.java
@@ -0,0 +1,177 @@
+/**

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

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

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

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis;

+

+/**

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

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

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

+ * @generated

+ */

+public class OperationTreeItemAxisItemProvider extends OperationAxisItemProvider {

+	/**

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

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

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

+	 * @generated

+	 */

+	public OperationTreeItemAxisItemProvider(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);

+

+			addParentPropertyDescriptor(object);

+			addExpandedPropertyDescriptor(object);

+			addChildrenPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

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

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

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

+	 * @generated

+	 */

+	protected void addParentPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_parent_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__PARENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

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

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

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

+	 * @generated

+	 */

+	protected void addExpandedPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_expanded_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__EXPANDED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

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

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

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

+	 * @generated

+	 */

+	protected void addChildrenPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_ITreeItemAxis_children_feature", "_UI_ITreeItemAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisPackage.Literals.ITREE_ITEM_AXIS__CHILDREN,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

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

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

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

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((OperationTreeItemAxis)object).getAlias();

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

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

+			getString("_UI_OperationTreeItemAxis_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(OperationTreeItemAxis.class)) {

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:

+				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/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
index 78d168eb778..9ede05a4f89 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
@@ -36,7 +36,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration} object.

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

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

- * 

  * @generated

  */

 public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementItemProvider {

@@ -44,7 +43,6 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
 	 * This constructs an instance from a factory and a notifier.

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

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

-	 * 

 	 * @generated

 	 */

 	public AbstractHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -55,7 +53,6 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
 	 * This returns the property descriptors for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -75,100 +72,96 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
 	 * This adds a property descriptor for the Index Style feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addIndexStylePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_indexStyle_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_indexStyle_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Display Label feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addDisplayLabelPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayLabel_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayLabel_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Display Filter feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addDisplayFilterPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayFilter_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayFilter_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Display Index feature.

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

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

-	 * 

 	 * @generated

 	 */

 	protected void addDisplayIndexPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

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

-						getResourceLocator(),

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

-						getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayIndex_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

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

+				 getResourceLocator(),

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

+				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractHeaderAxisConfiguration_displayIndex_feature", "_UI_AbstractHeaderAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

-	 * 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

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

 	 */

 	@Override

@@ -184,7 +177,6 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -199,16 +191,15 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
 	 * This returns the label text for the adapted class.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		AxisIndexStyle labelValue = ((AbstractHeaderAxisConfiguration) object).getIndexStyle();

+		AxisIndexStyle labelValue = ((AbstractHeaderAxisConfiguration)object).getIndexStyle();

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

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

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

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

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

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

 	}

 

 

@@ -217,7 +208,6 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -225,16 +215,16 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(AbstractHeaderAxisConfiguration.class)) {

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -244,7 +234,6 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -252,46 +241,50 @@ public class AbstractHeaderAxisConfigurationItemProvider extends StyledElementIt
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,

-						NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

+				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,

-						NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

+				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS,

+				 NattablelabelproviderFactory.eINSTANCE.createOperationLabelProviderConfiguration()));

+

+		newChildDescriptors.add

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-						NattableaxisconfigurationFactory.eINSTANCE.createFeatureAxisConfiguration()));

+				 NattableaxisconfigurationFactory.eINSTANCE.createFeatureAxisConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-						NattableaxisconfigurationFactory.eINSTANCE.createEStructuralFeatureValueFillingConfiguration()));

+				 NattableaxisconfigurationFactory.eINSTANCE.createEStructuralFeatureValueFillingConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-						NattableaxisconfigurationFactory.eINSTANCE.createIPasteConfiguration()));

+				 NattableaxisconfigurationFactory.eINSTANCE.createIPasteConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-						NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration()));

+				 NattableaxisconfigurationFactory.eINSTANCE.createPasteEObjectConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS,

-						NattableaxisconfigurationFactory.eINSTANCE.createTreeFillingConfiguration()));

+				 NattableaxisconfigurationFactory.eINSTANCE.createTreeFillingConfiguration()));

 	}

 

 	/**

 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
index 64ad8c41435..f6dc84f9f43 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class AxisManagerConfigurationItemProvider extends StyledElementItemProvider {

@@ -37,7 +36,6 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AxisManagerConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -67,76 +64,72 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
 	 * This adds a property descriptor for the Local Header Label Configuration feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addLocalHeaderLabelConfigurationPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_AxisManagerConfiguration_localHeaderLabelConfiguration_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_localHeaderLabelConfiguration_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_AxisManagerConfiguration_localHeaderLabelConfiguration_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_localHeaderLabelConfiguration_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Axis Manager feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addAxisManagerPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_AxisManagerConfiguration_axisManager_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_axisManager_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_AxisManagerConfiguration_axisManager_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_axisManager_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Local Specific Configurations feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addLocalSpecificConfigurationsPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_AxisManagerConfiguration_localSpecificConfigurations_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_localSpecificConfigurations_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_AxisManagerConfiguration_localSpecificConfigurations_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerConfiguration_localSpecificConfigurations_feature", "_UI_AxisManagerConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns AxisManagerConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -148,7 +141,6 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -162,7 +154,6 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -176,7 +167,6 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -188,7 +178,6 @@ public class AxisManagerConfigurationItemProvider extends StyledElementItemProvi
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java
index 8893038420c..565cf2ed59f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class AxisManagerRepresentationItemProvider extends StyledElementItemProvider {

@@ -40,7 +39,6 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AxisManagerRepresentationItemProvider(AdapterFactory adapterFactory) {

@@ -51,7 +49,6 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -71,99 +68,94 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
 	 * This adds a property descriptor for the Axis Manager Id feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addAxisManagerIdPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_AxisManagerRepresentation_axisManagerId_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_axisManagerId_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_AxisManagerRepresentation_axisManagerId_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_axisManagerId_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Label Provider Context feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addLabelProviderContextPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_AxisManagerRepresentation_labelProviderContext_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_labelProviderContext_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_AxisManagerRepresentation_labelProviderContext_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_labelProviderContext_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Header Label Configuration feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addHeaderLabelConfigurationPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_AxisManagerRepresentation_headerLabelConfiguration_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_headerLabelConfiguration_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_AxisManagerRepresentation_headerLabelConfiguration_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_headerLabelConfiguration_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Specific Axis Configurations feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addSpecificAxisConfigurationsPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_AxisManagerRepresentation_specificAxisConfigurations_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_specificAxisConfigurations_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_AxisManagerRepresentation_specificAxisConfigurations_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_AxisManagerRepresentation_specificAxisConfigurations_feature", "_UI_AxisManagerRepresentation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns AxisManagerRepresentation.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -175,15 +167,14 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((AxisManagerRepresentation) object).getAxisManagerId();

+		String label = ((AxisManagerRepresentation)object).getAxisManagerId();

 		return label == null || label.length() == 0 ?

-				getString("_UI_AxisManagerRepresentation_type") : //$NON-NLS-1$

-				getString("_UI_AxisManagerRepresentation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_AxisManagerRepresentation_type") : //$NON-NLS-1$

+			getString("_UI_AxisManagerRepresentation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -192,7 +183,6 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -200,10 +190,10 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(AxisManagerRepresentation.class)) {

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -213,7 +203,6 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -225,7 +214,6 @@ public class AxisManagerRepresentationItemProvider extends StyledElementItemProv
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
index a5fcb2e8654..6492ec66b0d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class EStructuralFeatureValueFillingConfigurationItemProvider extends StyledElementItemProvider {

@@ -37,7 +36,6 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EStructuralFeatureValueFillingConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
 	 * This adds a property descriptor for the Listen Feature feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addListenFeaturePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_EStructuralFeatureValueFillingConfiguration_listenFeature_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeatureValueFillingConfiguration_listenFeature_feature", "_UI_EStructuralFeatureValueFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_EStructuralFeatureValueFillingConfiguration_listenFeature_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_EStructuralFeatureValueFillingConfiguration_listenFeature_feature", "_UI_EStructuralFeatureValueFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns EStructuralFeatureValueFillingConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,7 +95,6 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -114,7 +108,6 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -128,7 +121,6 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -140,7 +132,6 @@ public class EStructuralFeatureValueFillingConfigurationItemProvider extends Sty
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java
index e0034630182..13f0b34af08 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvider {

@@ -40,7 +39,6 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public FeatureAxisConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -51,7 +49,6 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -68,30 +65,28 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
 	 * This adds a property descriptor for the Show Only Common Feature feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addShowOnlyCommonFeaturePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FeatureAxisConfiguration_showOnlyCommonFeature_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FeatureAxisConfiguration_showOnlyCommonFeature_feature", "_UI_FeatureAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FeatureAxisConfiguration_showOnlyCommonFeature_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureAxisConfiguration_showOnlyCommonFeature_feature", "_UI_FeatureAxisConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns FeatureAxisConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -103,12 +98,11 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration) object;

+		FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration)object;

 		return getString("_UI_FeatureAxisConfiguration_type") + " " + featureAxisConfiguration.isShowOnlyCommonFeature(); //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

@@ -118,7 +112,6 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -126,9 +119,9 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(FeatureAxisConfiguration.class)) {

-		case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -138,7 +131,6 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -150,7 +142,6 @@ public class FeatureAxisConfigurationItemProvider extends StyledElementItemProvi
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java
index 4ae147740f6..b34be29eeaa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class IPasteConfigurationItemProvider extends StyledElementItemProvider {

@@ -40,7 +39,6 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IPasteConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -51,7 +49,6 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -69,53 +66,50 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
 	 * This adds a property descriptor for the Post Actions feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addPostActionsPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_IPasteConfiguration_postActions_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_IPasteConfiguration_postActions_feature", "_UI_IPasteConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION__POST_ACTIONS,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_IPasteConfiguration_postActions_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_IPasteConfiguration_postActions_feature", "_UI_IPasteConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION__POST_ACTIONS,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Detached Mode feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDetachedModePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_IPasteConfiguration_detachedMode_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_IPasteConfiguration_detachedMode_feature", "_UI_IPasteConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION__DETACHED_MODE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_IPasteConfiguration_detachedMode_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_IPasteConfiguration_detachedMode_feature", "_UI_IPasteConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.IPASTE_CONFIGURATION__DETACHED_MODE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns IPasteConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -127,12 +121,11 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		IPasteConfiguration iPasteConfiguration = (IPasteConfiguration) object;

+		IPasteConfiguration iPasteConfiguration = (IPasteConfiguration)object;

 		return getString("_UI_IPasteConfiguration_type") + " " + iPasteConfiguration.isDetachedMode(); //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

@@ -142,7 +135,6 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -150,10 +142,10 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(IPasteConfiguration.class)) {

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -163,7 +155,6 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -175,7 +166,6 @@ public class IPasteConfigurationItemProvider extends StyledElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
index a153cbb618b..eca21111524 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
@@ -30,7 +30,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxisConfigurationItemProvider {

@@ -38,7 +37,6 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public LocalTableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -49,7 +47,6 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -62,11 +59,11 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
 	}

 

 	/**

-	 * 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

+	 * 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

 	 */

 	@Override

@@ -81,7 +78,6 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -96,7 +92,6 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
 	 * This returns LocalTableHeaderAxisConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -108,16 +103,15 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		AxisIndexStyle labelValue = ((LocalTableHeaderAxisConfiguration) object).getIndexStyle();

+		AxisIndexStyle labelValue = ((LocalTableHeaderAxisConfiguration)object).getIndexStyle();

 		String label = labelValue == null ? null : labelValue.toString();

 		return label == null || label.length() == 0 ?

-				getString("_UI_LocalTableHeaderAxisConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_LocalTableHeaderAxisConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_LocalTableHeaderAxisConfiguration_type") : //$NON-NLS-1$

+			getString("_UI_LocalTableHeaderAxisConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -126,7 +120,6 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -134,9 +127,9 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(LocalTableHeaderAxisConfiguration.class)) {

-		case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -146,7 +139,6 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -154,9 +146,9 @@ public class LocalTableHeaderAxisConfigurationItemProvider extends AbstractHeade
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS,

-						NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration()));

+				 NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration()));

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
index ca1dcf8c9b1..f2105ea9328 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableaxisconfigurationItemProviderAdapterFactory extends NattableaxisconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +45,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -55,7 +53,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -64,7 +61,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -73,7 +69,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This constructs an instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableaxisconfigurationItemProviderAdapterFactory() {

@@ -88,7 +83,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AxisManagerRepresentationItemProvider axisManagerRepresentationItemProvider;

@@ -97,7 +91,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -113,7 +106,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AxisManagerConfigurationItemProvider axisManagerConfigurationItemProvider;

@@ -122,7 +114,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -138,7 +129,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableHeaderAxisConfigurationItemProvider tableHeaderAxisConfigurationItemProvider;

@@ -147,7 +137,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -163,7 +152,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected LocalTableHeaderAxisConfigurationItemProvider localTableHeaderAxisConfigurationItemProvider;

@@ -172,7 +160,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -188,7 +175,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected FeatureAxisConfigurationItemProvider featureAxisConfigurationItemProvider;

@@ -197,7 +183,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -213,7 +198,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EStructuralFeatureValueFillingConfigurationItemProvider eStructuralFeatureValueFillingConfigurationItemProvider;

@@ -222,7 +206,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -238,7 +221,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IPasteConfigurationItemProvider iPasteConfigurationItemProvider;

@@ -247,7 +229,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -263,7 +244,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected PasteEObjectConfigurationItemProvider pasteEObjectConfigurationItemProvider;

@@ -272,7 +252,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -288,7 +267,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeFillingConfigurationItemProvider treeFillingConfigurationItemProvider;

@@ -297,7 +275,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -313,7 +290,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This returns the root adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -325,7 +301,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This sets the composed adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -336,7 +311,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -348,7 +322,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -359,14 +332,13 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

 		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -378,7 +350,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This adds a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -390,7 +361,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This removes a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -402,7 +372,6 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -415,32 +384,22 @@ public class NattableaxisconfigurationItemProviderAdapterFactory extends Nattabl
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory.

+	 * This disposes all of the item providers created by this factory. 

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void dispose() {

-		if (axisManagerRepresentationItemProvider != null)

-			axisManagerRepresentationItemProvider.dispose();

-		if (axisManagerConfigurationItemProvider != null)

-			axisManagerConfigurationItemProvider.dispose();

-		if (tableHeaderAxisConfigurationItemProvider != null)

-			tableHeaderAxisConfigurationItemProvider.dispose();

-		if (localTableHeaderAxisConfigurationItemProvider != null)

-			localTableHeaderAxisConfigurationItemProvider.dispose();

-		if (featureAxisConfigurationItemProvider != null)

-			featureAxisConfigurationItemProvider.dispose();

-		if (eStructuralFeatureValueFillingConfigurationItemProvider != null)

-			eStructuralFeatureValueFillingConfigurationItemProvider.dispose();

-		if (iPasteConfigurationItemProvider != null)

-			iPasteConfigurationItemProvider.dispose();

-		if (pasteEObjectConfigurationItemProvider != null)

-			pasteEObjectConfigurationItemProvider.dispose();

-		if (treeFillingConfigurationItemProvider != null)

-			treeFillingConfigurationItemProvider.dispose();

+		if (axisManagerRepresentationItemProvider != null) axisManagerRepresentationItemProvider.dispose();

+		if (axisManagerConfigurationItemProvider != null) axisManagerConfigurationItemProvider.dispose();

+		if (tableHeaderAxisConfigurationItemProvider != null) tableHeaderAxisConfigurationItemProvider.dispose();

+		if (localTableHeaderAxisConfigurationItemProvider != null) localTableHeaderAxisConfigurationItemProvider.dispose();

+		if (featureAxisConfigurationItemProvider != null) featureAxisConfigurationItemProvider.dispose();

+		if (eStructuralFeatureValueFillingConfigurationItemProvider != null) eStructuralFeatureValueFillingConfigurationItemProvider.dispose();

+		if (iPasteConfigurationItemProvider != null) iPasteConfigurationItemProvider.dispose();

+		if (pasteEObjectConfigurationItemProvider != null) pasteEObjectConfigurationItemProvider.dispose();

+		if (treeFillingConfigurationItemProvider != null) treeFillingConfigurationItemProvider.dispose();

 	}

 

 }

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 a60b9d1552d..a5e44b913e0 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
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationItemProvider {

@@ -37,7 +36,6 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public PasteEObjectConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -66,53 +63,50 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
 	 * This adds a property descriptor for the Pasted Element Id feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addPastedElementIdPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_PasteEObjectConfiguration_pastedElementId_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_PasteEObjectConfiguration_pastedElementId_feature", "_UI_PasteEObjectConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_PasteEObjectConfiguration_pastedElementId_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_PasteEObjectConfiguration_pastedElementId_feature", "_UI_PasteEObjectConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Paste Element Containement Feature feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addPasteElementContainementFeaturePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_PasteEObjectConfiguration_pasteElementContainementFeature_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_PasteEObjectConfiguration_pasteElementContainementFeature_feature", "_UI_PasteEObjectConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_PasteEObjectConfiguration_pasteElementContainementFeature_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_PasteEObjectConfiguration_pasteElementContainementFeature_feature", "_UI_PasteEObjectConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns PasteEObjectConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -124,12 +118,11 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		PasteEObjectConfiguration pasteEObjectConfiguration = (PasteEObjectConfiguration) object;

+		PasteEObjectConfiguration pasteEObjectConfiguration = (PasteEObjectConfiguration)object;

 		return getString("_UI_PasteEObjectConfiguration_type") + " " + pasteEObjectConfiguration.isDetachedMode(); //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

@@ -139,7 +132,6 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -147,9 +139,9 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(PasteEObjectConfiguration.class)) {

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -159,7 +151,6 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
index 8e9bc4eb0ae..9f6aee2495b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
@@ -30,7 +30,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxisConfigurationItemProvider {

@@ -38,7 +37,6 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public TableHeaderAxisConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -49,7 +47,6 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -62,11 +59,11 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
 	}

 

 	/**

-	 * 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

+	 * 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

 	 */

 	@Override

@@ -81,7 +78,6 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -96,7 +92,6 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
 	 * This returns TableHeaderAxisConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -108,16 +103,15 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		AxisIndexStyle labelValue = ((TableHeaderAxisConfiguration) object).getIndexStyle();

+		AxisIndexStyle labelValue = ((TableHeaderAxisConfiguration)object).getIndexStyle();

 		String label = labelValue == null ? null : labelValue.toString();

 		return label == null || label.length() == 0 ?

-				getString("_UI_TableHeaderAxisConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_TableHeaderAxisConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_TableHeaderAxisConfiguration_type") : //$NON-NLS-1$

+			getString("_UI_TableHeaderAxisConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -126,7 +120,6 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -134,9 +127,9 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(TableHeaderAxisConfiguration.class)) {

-		case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -146,7 +139,6 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -154,9 +146,9 @@ public class TableHeaderAxisConfigurationItemProvider extends AbstractHeaderAxis
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS,

-						NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerRepresentation()));

+				 NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerRepresentation()));

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java
index 592eb6d760b..374ba76b393 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TreeFillingConfigurationItemProvider.java
@@ -34,7 +34,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class TreeFillingConfigurationItemProvider extends StyledElementItemProvider {

@@ -42,7 +41,6 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public TreeFillingConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -53,7 +51,6 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -73,100 +70,96 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
 	 * This adds a property descriptor for the Paste Configuration feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addPasteConfigurationPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_TreeFillingConfiguration_pasteConfiguration_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_pasteConfiguration_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_TreeFillingConfiguration_pasteConfiguration_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_pasteConfiguration_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Depth feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDepthPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_TreeFillingConfiguration_depth_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_depth_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__DEPTH,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_TreeFillingConfiguration_depth_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_depth_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__DEPTH,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Label Provider feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addLabelProviderPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_TreeFillingConfiguration_labelProvider_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_labelProvider_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_TreeFillingConfiguration_labelProvider_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_labelProvider_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Label Provider Context feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addLabelProviderContextPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_TreeFillingConfiguration_labelProviderContext_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_labelProviderContext_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_TreeFillingConfiguration_labelProviderContext_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TreeFillingConfiguration_labelProviderContext_feature", "_UI_TreeFillingConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

-	 * 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

+	 * 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

 	 */

 	@Override

@@ -181,7 +174,6 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -196,7 +188,6 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
 	 * This returns TreeFillingConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -208,12 +199,11 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration) object;

+		TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration)object;

 		return getString("_UI_TreeFillingConfiguration_type") + " " + treeFillingConfiguration.getDepth(); //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

@@ -223,7 +213,6 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -231,13 +220,13 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(TreeFillingConfiguration.class)) {

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -247,7 +236,6 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -255,71 +243,70 @@ public class TreeFillingConfigurationItemProvider extends StyledElementItemProvi
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createEObjectAxis()));

+				 NattableaxisFactory.eINSTANCE.createEObjectAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createFeatureTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createObjectTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));

+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createEOperationAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));

+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createObjectIdAxis()));

+				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER,

-						NattableaxisFactory.eINSTANCE.createAxisGroup()));

+				 NattableaxisFactory.eINSTANCE.createAxisGroup()));

 	}

 

 	/**

 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
index ce87559a57c..c08cd2b0763 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvider {

@@ -36,7 +35,6 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AbstractAxisProviderItemProvider(AdapterFactory adapterFactory) {

@@ -47,7 +45,6 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -63,15 +60,14 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((AbstractAxisProvider) object).getName();

+		String label = ((AbstractAxisProvider)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_AbstractAxisProvider_type") : //$NON-NLS-1$

-				getString("_UI_AbstractAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_AbstractAxisProvider_type") : //$NON-NLS-1$

+			getString("_UI_AbstractAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -80,7 +76,6 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -94,7 +89,6 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -106,7 +100,6 @@ public class AbstractAxisProviderItemProvider extends TableNamedElementItemProvi
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
index 0a685b8ab14..1ebaf214d90 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {

@@ -37,7 +36,6 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AxisProviderItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -61,11 +58,11 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
 	}

 

 	/**

-	 * 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

+	 * 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

 	 */

 	@Override

@@ -80,7 +77,6 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -95,15 +91,14 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((AxisProvider) object).getName();

+		String label = ((AxisProvider)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_AxisProvider_type") : //$NON-NLS-1$

-				getString("_UI_AxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_AxisProvider_type") : //$NON-NLS-1$

+			getString("_UI_AxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -112,7 +107,6 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -120,9 +114,9 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(AxisProvider.class)) {

-		case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -132,7 +126,6 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -140,64 +133,64 @@ public class AxisProviderItemProvider extends AbstractAxisProviderItemProvider {
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createEObjectAxis()));

+				 NattableaxisFactory.eINSTANCE.createEObjectAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createFeatureTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createObjectTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));

+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createEOperationAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));

+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createObjectIdAxis()));

+				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));

+				 NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableaxisproviderPackage.Literals.AXIS_PROVIDER__AXIS,

-						NattableaxisFactory.eINSTANCE.createAxisGroup()));

+				 NattableaxisFactory.eINSTANCE.createAxisGroup()));

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java
index 928472f682c..c6c8011032e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvider {

@@ -37,7 +36,6 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public MasterObjectAxisProviderItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
 	 * This adds a property descriptor for the Disconnect Slave feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDisconnectSlavePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_IMasterAxisProvider_disconnectSlave_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_IMasterAxisProvider_disconnectSlave_feature", "_UI_IMasterAxisProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_IMasterAxisProvider_disconnectSlave_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_IMasterAxisProvider_disconnectSlave_feature", "_UI_IMasterAxisProvider_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableaxisproviderPackage.Literals.IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns MasterObjectAxisProvider.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,15 +95,14 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((MasterObjectAxisProvider) object).getName();

+		String label = ((MasterObjectAxisProvider)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_MasterObjectAxisProvider_type") : //$NON-NLS-1$

-				getString("_UI_MasterObjectAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_MasterObjectAxisProvider_type") : //$NON-NLS-1$

+			getString("_UI_MasterObjectAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -117,7 +111,6 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -125,9 +118,9 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(MasterObjectAxisProvider.class)) {

-		case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -137,7 +130,6 @@ public class MasterObjectAxisProviderItemProvider extends AxisProviderItemProvid
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java
index bccee771475..c4dde09fcdc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ut
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableaxisproviderItemProviderAdapterFactory extends NattableaxisproviderAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +45,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -55,7 +53,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -64,7 +61,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -73,7 +69,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This constructs an instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableaxisproviderItemProviderAdapterFactory() {

@@ -88,7 +83,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected SlaveObjectAxisProviderItemProvider slaveObjectAxisProviderItemProvider;

@@ -97,7 +91,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -113,7 +106,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected MasterObjectAxisProviderItemProvider masterObjectAxisProviderItemProvider;

@@ -122,7 +114,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -138,7 +129,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This returns the root adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -150,7 +140,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This sets the composed adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -161,7 +150,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,7 +161,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -184,14 +171,13 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

 		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -203,7 +189,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This adds a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -215,7 +200,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This removes a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -227,7 +211,6 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -240,18 +223,15 @@ public class NattableaxisproviderItemProviderAdapterFactory extends Nattableaxis
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory.

+	 * This disposes all of the item providers created by this factory. 

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void dispose() {

-		if (slaveObjectAxisProviderItemProvider != null)

-			slaveObjectAxisProviderItemProvider.dispose();

-		if (masterObjectAxisProviderItemProvider != null)

-			masterObjectAxisProviderItemProvider.dispose();

+		if (slaveObjectAxisProviderItemProvider != null) slaveObjectAxisProviderItemProvider.dispose();

+		if (masterObjectAxisProviderItemProvider != null) masterObjectAxisProviderItemProvider.dispose();

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java
index 20a51bb4690..ce486c1ed4b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java
@@ -25,7 +25,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Sl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvider {

@@ -33,7 +32,6 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public SlaveObjectAxisProviderItemProvider(AdapterFactory adapterFactory) {

@@ -44,7 +42,6 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -60,7 +57,6 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
 	 * This returns SlaveObjectAxisProvider.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -72,15 +68,14 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((SlaveObjectAxisProvider) object).getName();

+		String label = ((SlaveObjectAxisProvider)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_SlaveObjectAxisProvider_type") : //$NON-NLS-1$

-				getString("_UI_SlaveObjectAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_SlaveObjectAxisProvider_type") : //$NON-NLS-1$

+			getString("_UI_SlaveObjectAxisProvider_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -89,7 +84,6 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -103,7 +97,6 @@ public class SlaveObjectAxisProviderItemProvider extends AxisProviderItemProvide
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java
index 195e652efba..174dbf6e057 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/CellItemProvider.java
@@ -33,7 +33,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class CellItemProvider extends EModelElementItemProvider {

@@ -41,7 +40,6 @@ public class CellItemProvider extends EModelElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public CellItemProvider(AdapterFactory adapterFactory) {

@@ -52,7 +50,6 @@ public class CellItemProvider extends EModelElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,11 +62,11 @@ public class CellItemProvider extends EModelElementItemProvider {
 	}

 

 	/**

-	 * 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

+	 * 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

 	 */

 	@Override

@@ -86,7 +83,6 @@ public class CellItemProvider extends EModelElementItemProvider {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -101,7 +97,6 @@ public class CellItemProvider extends EModelElementItemProvider {
 	 * This returns Cell.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -113,7 +108,6 @@ public class CellItemProvider extends EModelElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -127,7 +121,6 @@ public class CellItemProvider extends EModelElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -135,11 +128,11 @@ public class CellItemProvider extends EModelElementItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(Cell.class)) {

-		case NattablecellPackage.CELL__COLUMN_WRAPPER:

-		case NattablecellPackage.CELL__ROW_WRAPPER:

-		case NattablecellPackage.CELL__PROBLEMS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case NattablecellPackage.CELL__COLUMN_WRAPPER:

+			case NattablecellPackage.CELL__ROW_WRAPPER:

+			case NattablecellPackage.CELL__PROBLEMS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -149,7 +142,6 @@ public class CellItemProvider extends EModelElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -157,41 +149,40 @@ public class CellItemProvider extends EModelElementItemProvider {
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER,

-						NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));

+				 NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablecellPackage.Literals.CELL__COLUMN_WRAPPER,

-						NattablecellFactory.eINSTANCE.createIdAxisWrapper()));

+				 NattablecellFactory.eINSTANCE.createIdAxisWrapper()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablecellPackage.Literals.CELL__ROW_WRAPPER,

-						NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));

+				 NattablecellFactory.eINSTANCE.createEObjectAxisWrapper()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablecellPackage.Literals.CELL__ROW_WRAPPER,

-						NattablecellFactory.eINSTANCE.createIdAxisWrapper()));

+				 NattablecellFactory.eINSTANCE.createIdAxisWrapper()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablecellPackage.Literals.CELL__PROBLEMS,

-						NattableproblemFactory.eINSTANCE.createProblem()));

+				 NattableproblemFactory.eINSTANCE.createProblem()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablecellPackage.Literals.CELL__PROBLEMS,

-						NattableproblemFactory.eINSTANCE.createStringResolutionProblem()));

+				 NattableproblemFactory.eINSTANCE.createStringResolutionProblem()));

 	}

 

 	/**

 	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -200,12 +191,13 @@ public class CellItemProvider extends EModelElementItemProvider {
 		Object childObject = child;

 

 		boolean qualify =

-				childFeature == NattablecellPackage.Literals.CELL__COLUMN_WRAPPER ||

-						childFeature == NattablecellPackage.Literals.CELL__ROW_WRAPPER;

+			childFeature == NattablecellPackage.Literals.CELL__COLUMN_WRAPPER ||

+			childFeature == NattablecellPackage.Literals.CELL__ROW_WRAPPER;

 

 		if (qualify) {

-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$

-					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

+			return getString

+				("_UI_CreateChild_text2", //$NON-NLS-1$

+				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

 		}

 		return super.getCreateChildText(owner, feature, child, selection);

 	}

@@ -214,7 +206,6 @@ public class CellItemProvider extends EModelElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java
index 734e339865a..8dc6d846f6f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/EObjectAxisWrapperItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {

@@ -37,7 +36,6 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EObjectAxisWrapperItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * This adds a property descriptor for the Element feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addElementPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_EObjectAxisWrapper_element_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_EObjectAxisWrapper_element_feature", "_UI_EObjectAxisWrapper_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablecellPackage.Literals.EOBJECT_AXIS_WRAPPER__ELEMENT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_EObjectAxisWrapper_element_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectAxisWrapper_element_feature", "_UI_EObjectAxisWrapper_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablecellPackage.Literals.EOBJECT_AXIS_WRAPPER__ELEMENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns EObjectAxisWrapper.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,7 +95,6 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -114,7 +108,6 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -128,7 +121,6 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -140,7 +132,6 @@ public class EObjectAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java
index 354443d2ba5..95aff16fd40 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/IdAxisWrapperItemProvider.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class IdAxisWrapperItemProvider extends EModelElementItemProvider {

@@ -40,7 +39,6 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IdAxisWrapperItemProvider(AdapterFactory adapterFactory) {

@@ -51,7 +49,6 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -68,30 +65,28 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * This adds a property descriptor for the Element feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addElementPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_IdAxisWrapper_element_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_IdAxisWrapper_element_feature", "_UI_IdAxisWrapper_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablecellPackage.Literals.ID_AXIS_WRAPPER__ELEMENT,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_IdAxisWrapper_element_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_IdAxisWrapper_element_feature", "_UI_IdAxisWrapper_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablecellPackage.Literals.ID_AXIS_WRAPPER__ELEMENT,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns IdAxisWrapper.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -103,15 +98,14 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((IdAxisWrapper) object).getElement();

+		String label = ((IdAxisWrapper)object).getElement();

 		return label == null || label.length() == 0 ?

-				getString("_UI_IdAxisWrapper_type") : //$NON-NLS-1$

-				getString("_UI_IdAxisWrapper_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_IdAxisWrapper_type") : //$NON-NLS-1$

+			getString("_UI_IdAxisWrapper_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -120,7 +114,6 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -128,9 +121,9 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(IdAxisWrapper.class)) {

-		case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -140,7 +133,6 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -152,7 +144,6 @@ public class IdAxisWrapperItemProvider extends EModelElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java
index f9e4df9727b..b8577392e58 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/provider/NattablecellItemProviderAdapterFactory.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.util.Natta
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +45,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -55,7 +53,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -64,7 +61,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -73,7 +69,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This constructs an instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattablecellItemProviderAdapterFactory() {

@@ -88,7 +83,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected CellItemProvider cellItemProvider;

@@ -97,7 +91,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -113,7 +106,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObjectAxisWrapperItemProvider eObjectAxisWrapperItemProvider;

@@ -122,7 +114,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -138,7 +129,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IdAxisWrapperItemProvider idAxisWrapperItemProvider;

@@ -147,7 +137,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -163,7 +152,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This returns the root adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -175,7 +163,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This sets the composed adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -186,7 +173,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -198,7 +184,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -209,14 +194,13 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

 		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -228,7 +212,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This adds a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -240,7 +223,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This removes a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -252,7 +234,6 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -265,20 +246,16 @@ public class NattablecellItemProviderAdapterFactory extends NattablecellAdapterF
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory.

+	 * This disposes all of the item providers created by this factory. 

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void dispose() {

-		if (cellItemProvider != null)

-			cellItemProvider.dispose();

-		if (eObjectAxisWrapperItemProvider != null)

-			eObjectAxisWrapperItemProvider.dispose();

-		if (idAxisWrapperItemProvider != null)

-			idAxisWrapperItemProvider.dispose();

+		if (cellItemProvider != null) cellItemProvider.dispose();

+		if (eObjectAxisWrapperItemProvider != null) eObjectAxisWrapperItemProvider.dispose();

+		if (idAxisWrapperItemProvider != null) idAxisWrapperItemProvider.dispose();

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
index 7592e857dfb..621cec77e1b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.u
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableconfigurationItemProviderAdapterFactory extends NattableconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +45,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -55,7 +53,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -64,7 +61,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -73,7 +69,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * This constructs an instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableconfigurationItemProviderAdapterFactory() {

@@ -88,7 +83,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * 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 TableConfigurationItemProvider tableConfigurationItemProvider;

@@ -97,7 +91,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -113,7 +106,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * This returns the root adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -125,7 +117,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * This sets the composed adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -136,7 +127,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -148,7 +138,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -159,14 +148,13 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

 		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -178,7 +166,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * This adds a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -190,7 +177,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * This removes a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -202,7 +188,6 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -215,16 +200,14 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory.

+	 * This disposes all of the item providers created by this factory. 

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void dispose() {

-		if (tableConfigurationItemProvider != null)

-			tableConfigurationItemProvider.dispose();

+		if (tableConfigurationItemProvider != null) tableConfigurationItemProvider.dispose();

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
index 0aceb4490a8..4d63dc09e63 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
@@ -33,7 +33,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
  * 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 TableConfigurationItemProvider extends TableNamedElementItemProvider {

@@ -41,7 +40,6 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public TableConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -52,7 +50,6 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -73,123 +70,118 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
 	 * This adds a property descriptor for the Type feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addTypePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						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,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 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,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Icon Path feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addIconPathPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						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,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 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,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Cell Editor Declaration feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addCellEditorDeclarationPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_TableConfiguration_cellEditorDeclaration_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_cellEditorDeclaration_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_TableConfiguration_cellEditorDeclaration_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_cellEditorDeclaration_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Default Row Axis Provider feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDefaultRowAxisProviderPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_TableConfiguration_defaultRowAxisProvider_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_defaultRowAxisProvider_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_TableConfiguration_defaultRowAxisProvider_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_defaultRowAxisProvider_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Default Column Axis Provider feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDefaultColumnAxisProviderPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_TableConfiguration_defaultColumnAxisProvider_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_defaultColumnAxisProvider_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_TableConfiguration_defaultColumnAxisProvider_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_defaultColumnAxisProvider_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

-	 * 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

+	 * 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

 	 */

 	@Override

@@ -208,7 +200,6 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -223,7 +214,6 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
 	 * This returns TableConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -235,15 +225,14 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((TableConfiguration) object).getName();

+		String label = ((TableConfiguration)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_TableConfiguration_type") : //$NON-NLS-1$

-				getString("_UI_TableConfiguration_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$

 	}

 

 

@@ -252,7 +241,6 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -260,18 +248,18 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(TableConfiguration.class)) {

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -281,7 +269,6 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -289,46 +276,45 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CREATION_TESTER,

-						NattabletesterFactory.eINSTANCE.createJavaTableTester()));

+				 NattabletesterFactory.eINSTANCE.createJavaTableTester()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION,

-						NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));

+				 NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION,

-						NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));

+				 NattableaxisconfigurationFactory.eINSTANCE.createTableHeaderAxisConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS,

-						NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

+				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS,

-						NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

+				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS,

-						NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

+				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS,

-						NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

+				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

 	}

 

 	/**

 	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -337,14 +323,15 @@ public class TableConfigurationItemProvider extends TableNamedElementItemProvide
 		Object childObject = child;

 

 		boolean qualify =

-				childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION ||

-						childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION ||

-						childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS ||

-						childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS;

+			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION ||

+			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION ||

+			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS ||

+			childFeature == NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS;

 

 		if (qualify) {

-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$

-					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

+			return getString

+				("_UI_CreateChild_text2", //$NON-NLS-1$

+				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

 		}

 		return super.getCreateChildText(owner, feature, child, selection);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
index 70454152faa..932f89f85f2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class TableNamedElementItemProvider extends StyledElementItemProvider {

@@ -40,7 +39,6 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public TableNamedElementItemProvider(AdapterFactory adapterFactory) {

@@ -51,7 +49,6 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -69,61 +66,58 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
 	 * 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_TableNamedElement_description_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_TableNamedElement_description_feature", "_UI_TableNamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT__DESCRIPTION,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_TableNamedElement_description_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TableNamedElement_description_feature", "_UI_TableNamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT__DESCRIPTION,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * 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_TableNamedElement_name_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_TableNamedElement_name_feature", "_UI_TableNamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT__NAME,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_TableNamedElement_name_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TableNamedElement_name_feature", "_UI_TableNamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT__NAME,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((TableNamedElement) object).getName();

+		String label = ((TableNamedElement)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_TableNamedElement_type") : //$NON-NLS-1$

-				getString("_UI_TableNamedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_TableNamedElement_type") : //$NON-NLS-1$

+			getString("_UI_TableNamedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -132,7 +126,6 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -140,10 +133,10 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(TableNamedElement.class)) {

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -153,7 +146,6 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -165,7 +157,6 @@ public class TableNamedElementItemProvider extends StyledElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
index 8f705ae58ff..0d142edb267 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelProviderConfigurationItemProvider {

@@ -37,7 +36,6 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public FeatureLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -68,99 +65,94 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
 	 * This adds a property descriptor for the Display Is Derived feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDisplayIsDerivedPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FeatureLabelProviderConfiguration_displayIsDerived_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayIsDerived_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FeatureLabelProviderConfiguration_displayIsDerived_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayIsDerived_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Display Type feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDisplayTypePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FeatureLabelProviderConfiguration_displayType_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayType_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FeatureLabelProviderConfiguration_displayType_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayType_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Display Multiplicity feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDisplayMultiplicityPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FeatureLabelProviderConfiguration_displayMultiplicity_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayMultiplicity_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FeatureLabelProviderConfiguration_displayMultiplicity_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayMultiplicity_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Display Name feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDisplayNamePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FeatureLabelProviderConfiguration_displayName_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayName_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FeatureLabelProviderConfiguration_displayName_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelProviderConfiguration_displayName_feature", "_UI_FeatureLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns FeatureLabelProviderConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -172,12 +164,11 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration) object;

+		FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)object;

 		return getString("_UI_FeatureLabelProviderConfiguration_type") + " " + featureLabelProviderConfiguration.isDisplayName(); //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

@@ -187,7 +178,6 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -195,12 +185,12 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(FeatureLabelProviderConfiguration.class)) {

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -210,7 +200,6 @@ public class FeatureLabelProviderConfigurationItemProvider extends ObjectLabelPr
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
index 87fc533c3f0..4e30597dad5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.u
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablelabelproviderItemProviderAdapterFactory extends NattablelabelproviderAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +45,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -55,7 +53,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -64,7 +61,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -73,7 +69,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This constructs an instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattablelabelproviderItemProviderAdapterFactory() {

@@ -88,7 +83,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected FeatureLabelProviderConfigurationItemProvider featureLabelProviderConfigurationItemProvider;

@@ -97,7 +91,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -113,7 +106,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * 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 ObjectLabelProviderConfigurationItemProvider objectLabelProviderConfigurationItemProvider;

@@ -122,7 +114,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -135,10 +126,32 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	}

 

 	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected OperationLabelProviderConfigurationItemProvider operationLabelProviderConfigurationItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createOperationLabelProviderConfigurationAdapter() {

+		if (operationLabelProviderConfigurationItemProvider == null) {

+			operationLabelProviderConfigurationItemProvider = new OperationLabelProviderConfigurationItemProvider(this);

+		}

+

+		return operationLabelProviderConfigurationItemProvider;

+	}

+

+	/**

 	 * This returns the root adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -150,7 +163,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This sets the composed adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -161,7 +173,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,7 +184,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -184,14 +194,13 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

 		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -203,7 +212,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This adds a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -215,7 +223,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This removes a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -227,7 +234,6 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -240,18 +246,16 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory.

+	 * This disposes all of the item providers created by this factory. 

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void dispose() {

-		if (featureLabelProviderConfigurationItemProvider != null)

-			featureLabelProviderConfigurationItemProvider.dispose();

-		if (objectLabelProviderConfigurationItemProvider != null)

-			objectLabelProviderConfigurationItemProvider.dispose();

+		if (featureLabelProviderConfigurationItemProvider != null) featureLabelProviderConfigurationItemProvider.dispose();

+		if (objectLabelProviderConfigurationItemProvider != null) objectLabelProviderConfigurationItemProvider.dispose();

+		if (operationLabelProviderConfigurationItemProvider != null) operationLabelProviderConfigurationItemProvider.dispose();

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
index 2a36a1e2e84..be2aecf683b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * 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 ObjectLabelProviderConfigurationItemProvider extends StyledElementItemProvider {

@@ -40,7 +39,6 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public ObjectLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {

@@ -51,7 +49,6 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -69,53 +66,50 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
 	 * This adds a property descriptor for the Display Icon feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDisplayIconPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						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,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 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,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Display Label feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDisplayLabelPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						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,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 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,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns ObjectLabelProviderConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -127,12 +121,11 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration) object;

+		ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)object;

 		return getString("_UI_ObjectLabelProviderConfiguration_type") + " " + objectLabelProviderConfiguration.isDisplayIcon(); //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

@@ -142,7 +135,6 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -150,10 +142,10 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(ObjectLabelProviderConfiguration.class)) {

-		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;

+			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;

 		}

 		super.notifyChanged(notification);

 	}

@@ -163,7 +155,6 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -175,7 +166,6 @@ public class ObjectLabelProviderConfigurationItemProvider extends StyledElementI
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/OperationLabelProviderConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/OperationLabelProviderConfigurationItemProvider.java
new file mode 100644
index 00000000000..e70ed33cdbd
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/OperationLabelProviderConfigurationItemProvider.java
@@ -0,0 +1,188 @@
+/**

+ * Copyright (c) 2013 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ */

+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.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.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class OperationLabelProviderConfigurationItemProvider extends ObjectLabelProviderConfigurationItemProvider {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public OperationLabelProviderConfigurationItemProvider(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);

+

+			addDisplayTypePropertyDescriptor(object);

+			addDisplayMultiplicityPropertyDescriptor(object);

+			addDisplayNamePropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Display Type feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addDisplayTypePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_OperationLabelProviderConfiguration_displayType_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_OperationLabelProviderConfiguration_displayType_feature", "_UI_OperationLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Display Multiplicity feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addDisplayMultiplicityPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_OperationLabelProviderConfiguration_displayMultiplicity_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_OperationLabelProviderConfiguration_displayMultiplicity_feature", "_UI_OperationLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Display Name feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addDisplayNamePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_OperationLabelProviderConfiguration_displayName_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_OperationLabelProviderConfiguration_displayName_feature", "_UI_OperationLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This returns OperationLabelProviderConfiguration.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/OperationLabelProviderConfiguration")); //$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) {

+		OperationLabelProviderConfiguration operationLabelProviderConfiguration = (OperationLabelProviderConfiguration)object;

+		return getString("_UI_OperationLabelProviderConfiguration_type") + " " + operationLabelProviderConfiguration.isDisplayName(); //$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(OperationLabelProviderConfiguration.class)) {

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

+				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/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java
index 031affbb6bd..37bec03116c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/NattableproblemItemProviderAdapterFactory.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.util.Na
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableproblemItemProviderAdapterFactory extends NattableproblemAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +45,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -55,7 +53,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -64,7 +61,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -73,7 +69,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This constructs an instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableproblemItemProviderAdapterFactory() {

@@ -88,7 +83,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ProblemItemProvider problemItemProvider;

@@ -97,7 +91,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -113,7 +106,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected StringResolutionProblemItemProvider stringResolutionProblemItemProvider;

@@ -122,7 +114,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -138,7 +129,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This returns the root adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -150,7 +140,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This sets the composed adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -161,7 +150,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -173,7 +161,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -184,14 +171,13 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

 		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -203,7 +189,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This adds a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -215,7 +200,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This removes a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -227,7 +211,6 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -240,18 +223,15 @@ public class NattableproblemItemProviderAdapterFactory extends NattableproblemAd
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory.

+	 * This disposes all of the item providers created by this factory. 

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void dispose() {

-		if (problemItemProvider != null)

-			problemItemProvider.dispose();

-		if (stringResolutionProblemItemProvider != null)

-			stringResolutionProblemItemProvider.dispose();

+		if (problemItemProvider != null) problemItemProvider.dispose();

+		if (stringResolutionProblemItemProvider != null) stringResolutionProblemItemProvider.dispose();

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java
index 55e087c7d29..5ac51cf83e5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/ProblemItemProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class ProblemItemProvider extends TableNamedElementItemProvider {

@@ -36,7 +35,6 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public ProblemItemProvider(AdapterFactory adapterFactory) {

@@ -47,7 +45,6 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -63,7 +60,6 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
 	 * This returns Problem.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -75,15 +71,14 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((Problem) object).getName();

+		String label = ((Problem)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_Problem_type") : //$NON-NLS-1$

-				getString("_UI_Problem_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_Problem_type") : //$NON-NLS-1$

+			getString("_UI_Problem_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -92,7 +87,6 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -106,7 +100,6 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -118,7 +111,6 @@ public class ProblemItemProvider extends TableNamedElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java
index 5b96d0f7488..1c36a0d322e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/provider/StringResolutionProblemItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringR
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class StringResolutionProblemItemProvider extends ProblemItemProvider {

@@ -37,7 +36,6 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public StringResolutionProblemItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -66,53 +63,50 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
 	 * This adds a property descriptor for the Value As String feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addValueAsStringPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_StringResolutionProblem_valueAsString_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_StringResolutionProblem_valueAsString_feature", "_UI_StringResolutionProblem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_StringResolutionProblem_valueAsString_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_StringResolutionProblem_valueAsString_feature", "_UI_StringResolutionProblem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Unresolved String feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addUnresolvedStringPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_StringResolutionProblem_unresolvedString_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_StringResolutionProblem_unresolvedString_feature", "_UI_StringResolutionProblem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_StringResolutionProblem_unresolvedString_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_StringResolutionProblem_unresolvedString_feature", "_UI_StringResolutionProblem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableproblemPackage.Literals.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns StringResolutionProblem.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -124,15 +118,14 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((StringResolutionProblem) object).getName();

+		String label = ((StringResolutionProblem)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_StringResolutionProblem_type") : //$NON-NLS-1$

-				getString("_UI_StringResolutionProblem_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_StringResolutionProblem_type") : //$NON-NLS-1$

+			getString("_UI_StringResolutionProblem_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -141,7 +134,6 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -149,10 +141,10 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(StringResolutionProblem.class)) {

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -162,7 +154,6 @@ public class StringResolutionProblemItemProvider extends ProblemItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java
index ddd5b6e1f27..846008a60de 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanListValueStyleItemProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {

@@ -37,7 +36,6 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public BooleanListValueStyleItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This adds a property descriptor for the Boolean List Value feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addBooleanListValuePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_BooleanListValueStyle_booleanListValue_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_BooleanListValueStyle_booleanListValue_feature", "_UI_BooleanListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_BooleanListValueStyle_booleanListValue_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_BooleanListValueStyle_booleanListValue_feature", "_UI_BooleanListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns BooleanListValueStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,15 +95,14 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((BooleanListValueStyle) object).getName();

+		String label = ((BooleanListValueStyle)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_BooleanListValueStyle_type") : //$NON-NLS-1$

-				getString("_UI_BooleanListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_BooleanListValueStyle_type") : //$NON-NLS-1$

+			getString("_UI_BooleanListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -116,7 +110,6 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -124,9 +117,9 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(BooleanListValueStyle.class)) {

-		case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -136,7 +129,6 @@ public class BooleanListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java
index b86105f69f2..d0cb8597f64 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/BooleanValueStyleItemProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {

@@ -37,7 +36,6 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public BooleanValueStyleItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This adds a property descriptor for the Boolean Value feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addBooleanValuePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_BooleanValueStyle_booleanValue_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_BooleanValueStyle_booleanValue_feature", "_UI_BooleanValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_BooleanValueStyle_booleanValue_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_BooleanValueStyle_booleanValue_feature", "_UI_BooleanValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns BooleanValueStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,15 +95,14 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((BooleanValueStyle) object).getName();

+		String label = ((BooleanValueStyle)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_BooleanValueStyle_type") : //$NON-NLS-1$

-				getString("_UI_BooleanValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_BooleanValueStyle_type") : //$NON-NLS-1$

+			getString("_UI_BooleanValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -116,7 +110,6 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -124,9 +117,9 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(BooleanValueStyle.class)) {

-		case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -136,7 +129,6 @@ public class BooleanValueStyleItemProvider extends NamedStyleItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java
index 53b84a00e1d..97ac6152d80 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/CellTextStyleItemProvider.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class CellTextStyleItemProvider extends EModelElementItemProvider {

@@ -41,7 +40,6 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public CellTextStyleItemProvider(AdapterFactory adapterFactory) {

@@ -52,7 +50,6 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -69,30 +66,28 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
 	 * This adds a property descriptor for the Alignment feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addAlignmentPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_CellTextStyle_alignment_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_CellTextStyle_alignment_feature", "_UI_CellTextStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.CELL_TEXT_STYLE__ALIGNMENT,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_CellTextStyle_alignment_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_CellTextStyle_alignment_feature", "_UI_CellTextStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.CELL_TEXT_STYLE__ALIGNMENT,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns CellTextStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -104,16 +99,15 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		CellTextAlignment labelValue = ((CellTextStyle) object).getAlignment();

+		CellTextAlignment labelValue = ((CellTextStyle)object).getAlignment();

 		String label = labelValue == null ? null : labelValue.toString();

 		return label == null || label.length() == 0 ?

-				getString("_UI_CellTextStyle_type") : //$NON-NLS-1$

-				getString("_UI_CellTextStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_CellTextStyle_type") : //$NON-NLS-1$

+			getString("_UI_CellTextStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -121,7 +115,6 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -129,9 +122,9 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(CellTextStyle.class)) {

-		case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -141,7 +134,6 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -153,7 +145,6 @@ public class CellTextStyleItemProvider extends EModelElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java
index 53efca4085b..d05523f4975 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleListValueStyleItemProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {

@@ -37,7 +36,6 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public DoubleListValueStyleItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This adds a property descriptor for the Double List Value feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDoubleListValuePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_DoubleListValueStyle_doubleListValue_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_DoubleListValueStyle_doubleListValue_feature", "_UI_DoubleListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_DoubleListValueStyle_doubleListValue_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_DoubleListValueStyle_doubleListValue_feature", "_UI_DoubleListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns DoubleListValueStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,15 +95,14 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((DoubleListValueStyle) object).getName();

+		String label = ((DoubleListValueStyle)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_DoubleListValueStyle_type") : //$NON-NLS-1$

-				getString("_UI_DoubleListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_DoubleListValueStyle_type") : //$NON-NLS-1$

+			getString("_UI_DoubleListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -116,7 +110,6 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -124,9 +117,9 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(DoubleListValueStyle.class)) {

-		case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -136,7 +129,6 @@ public class DoubleListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java
index 52bcc20de40..00e40e98d71 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/DoubleValueStyleItemProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {

@@ -37,7 +36,6 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public DoubleValueStyleItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This adds a property descriptor for the Double Value feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDoubleValuePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_DoubleValueStyle_doubleValue_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_DoubleValueStyle_doubleValue_feature", "_UI_DoubleValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.DOUBLE_VALUE_STYLE__DOUBLE_VALUE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.REAL_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_DoubleValueStyle_doubleValue_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_DoubleValueStyle_doubleValue_feature", "_UI_DoubleValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.DOUBLE_VALUE_STYLE__DOUBLE_VALUE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns DoubleValueStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,15 +95,14 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((DoubleValueStyle) object).getName();

+		String label = ((DoubleValueStyle)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_DoubleValueStyle_type") : //$NON-NLS-1$

-				getString("_UI_DoubleValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_DoubleValueStyle_type") : //$NON-NLS-1$

+			getString("_UI_DoubleValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -116,7 +110,6 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -124,9 +117,9 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(DoubleValueStyle.class)) {

-		case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -136,7 +129,6 @@ public class DoubleValueStyleItemProvider extends NamedStyleItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectListValueStyleItemProvider.java
index a0a947c3c69..b820ea88f7e 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectListValueStyleItemProvider.java
@@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- * 
  * @generated
  */
 public class EObjectListValueStyleItemProvider extends NamedStyleItemProvider {
@@ -35,7 +34,6 @@ public class EObjectListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EObjectListValueStyleItemProvider(AdapterFactory adapterFactory) {
@@ -46,7 +44,6 @@ public class EObjectListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -63,30 +60,28 @@ public class EObjectListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This adds a property descriptor for the EObject Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected void addEObjectValuePropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_EObjectListValueStyle_eObjectValue_feature"), //$NON-NLS-1$
-						getString("_UI_PropertyDescriptor_description", "_UI_EObjectListValueStyle_eObjectValue_feature", "_UI_EObjectListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						NattablestylePackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE,
-						true,
-						false,
-						true,
-						null,
-						null,
-						null));
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_EObjectListValueStyle_eObjectValue_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectListValueStyle_eObjectValue_feature", "_UI_EObjectListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
 	}
 
 	/**
 	 * This returns EObjectListValueStyle.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -98,15 +93,14 @@ public class EObjectListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((EObjectListValueStyle) object).getName();
+		String label = ((EObjectListValueStyle)object).getName();
 		return label == null || label.length() == 0 ?
-				getString("_UI_EObjectListValueStyle_type") : //$NON-NLS-1$
-				getString("_UI_EObjectListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+			getString("_UI_EObjectListValueStyle_type") : //$NON-NLS-1$
+			getString("_UI_EObjectListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 
@@ -115,7 +109,6 @@ public class EObjectListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -129,7 +122,6 @@ public class EObjectListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectValueStyleItemProvider.java
index 6a11af72b16..c39ac99905f 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/EObjectValueStyleItemProvider.java
@@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- * 
  * @generated
  */
 public class EObjectValueStyleItemProvider extends NamedStyleItemProvider {
@@ -35,7 +34,6 @@ public class EObjectValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EObjectValueStyleItemProvider(AdapterFactory adapterFactory) {
@@ -46,7 +44,6 @@ public class EObjectValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -63,30 +60,28 @@ public class EObjectValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This adds a property descriptor for the EObject Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected void addEObjectValuePropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_EObjectValueStyle_eObjectValue_feature"), //$NON-NLS-1$
-						getString("_UI_PropertyDescriptor_description", "_UI_EObjectValueStyle_eObjectValue_feature", "_UI_EObjectValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						NattablestylePackage.Literals.EOBJECT_VALUE_STYLE__EOBJECT_VALUE,
-						true,
-						false,
-						true,
-						null,
-						null,
-						null));
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_EObjectValueStyle_eObjectValue_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectValueStyle_eObjectValue_feature", "_UI_EObjectValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 NattablestylePackage.Literals.EOBJECT_VALUE_STYLE__EOBJECT_VALUE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
 	}
 
 	/**
 	 * This returns EObjectValueStyle.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -98,15 +93,14 @@ public class EObjectValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((EObjectValueStyle) object).getName();
+		String label = ((EObjectValueStyle)object).getName();
 		return label == null || label.length() == 0 ?
-				getString("_UI_EObjectValueStyle_type") : //$NON-NLS-1$
-				getString("_UI_EObjectValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+			getString("_UI_EObjectValueStyle_type") : //$NON-NLS-1$
+			getString("_UI_EObjectValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 
@@ -115,7 +109,6 @@ public class EObjectValueStyleItemProvider extends NamedStyleItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -129,7 +122,6 @@ public class EObjectValueStyleItemProvider extends NamedStyleItemProvider {
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java
index 799478996de..6f0a89d99fa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/FontStyleItemProvider.java
@@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class FontStyleItemProvider extends EModelElementItemProvider {

@@ -40,7 +39,6 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public FontStyleItemProvider(AdapterFactory adapterFactory) {

@@ -51,7 +49,6 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -74,168 +71,160 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
 	 * This adds a property descriptor for the Font Color feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addFontColorPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FontStyle_fontColor_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontColor_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.FONT_STYLE__FONT_COLOR,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FontStyle_fontColor_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontColor_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.FONT_STYLE__FONT_COLOR,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Font Name feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addFontNamePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FontStyle_fontName_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontName_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.FONT_STYLE__FONT_NAME,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FontStyle_fontName_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontName_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.FONT_STYLE__FONT_NAME,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Font Height feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addFontHeightPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FontStyle_fontHeight_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontHeight_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.FONT_STYLE__FONT_HEIGHT,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FontStyle_fontHeight_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_fontHeight_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.FONT_STYLE__FONT_HEIGHT,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Bold feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addBoldPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FontStyle_bold_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_bold_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.FONT_STYLE__BOLD,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FontStyle_bold_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_bold_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.FONT_STYLE__BOLD,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Italic feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addItalicPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FontStyle_italic_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_italic_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.FONT_STYLE__ITALIC,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FontStyle_italic_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_italic_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.FONT_STYLE__ITALIC,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Underline feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addUnderlinePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FontStyle_underline_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_underline_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.FONT_STYLE__UNDERLINE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FontStyle_underline_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_underline_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.FONT_STYLE__UNDERLINE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Strike Through feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addStrikeThroughPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_FontStyle_strikeThrough_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_strikeThrough_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.FONT_STYLE__STRIKE_THROUGH,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_FontStyle_strikeThrough_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_FontStyle_strikeThrough_feature", "_UI_FontStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.FONT_STYLE__STRIKE_THROUGH,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns FontStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -247,15 +236,14 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((FontStyle) object).getFontName();

+		String label = ((FontStyle)object).getFontName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_FontStyle_type") : //$NON-NLS-1$

-				getString("_UI_FontStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_FontStyle_type") : //$NON-NLS-1$

+			getString("_UI_FontStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -263,7 +251,6 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -271,15 +258,15 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(FontStyle.class)) {

-		case NattablestylePackage.FONT_STYLE__FONT_COLOR:

-		case NattablestylePackage.FONT_STYLE__FONT_NAME:

-		case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

-		case NattablestylePackage.FONT_STYLE__BOLD:

-		case NattablestylePackage.FONT_STYLE__ITALIC:

-		case NattablestylePackage.FONT_STYLE__UNDERLINE:

-		case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.FONT_STYLE__FONT_COLOR:

+			case NattablestylePackage.FONT_STYLE__FONT_NAME:

+			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

+			case NattablestylePackage.FONT_STYLE__BOLD:

+			case NattablestylePackage.FONT_STYLE__ITALIC:

+			case NattablestylePackage.FONT_STYLE__UNDERLINE:

+			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -289,7 +276,6 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -301,7 +287,6 @@ public class FontStyleItemProvider extends EModelElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java
index 33cf11dd581..c4401da160c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntListValueStyleItemProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class IntListValueStyleItemProvider extends NamedStyleItemProvider {

@@ -37,7 +36,6 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IntListValueStyleItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This adds a property descriptor for the Int List Value feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addIntListValuePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_IntListValueStyle_intListValue_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_IntListValueStyle_intListValue_feature", "_UI_IntListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.INT_LIST_VALUE_STYLE__INT_LIST_VALUE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_IntListValueStyle_intListValue_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_IntListValueStyle_intListValue_feature", "_UI_IntListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.INT_LIST_VALUE_STYLE__INT_LIST_VALUE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns IntListValueStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,15 +95,14 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((IntListValueStyle) object).getName();

+		String label = ((IntListValueStyle)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_IntListValueStyle_type") : //$NON-NLS-1$

-				getString("_UI_IntListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_IntListValueStyle_type") : //$NON-NLS-1$

+			getString("_UI_IntListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -116,7 +110,6 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -124,9 +117,9 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(IntListValueStyle.class)) {

-		case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -136,7 +129,6 @@ public class IntListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java
index 4f9256a2220..d6584d60edf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/IntValueStyleItemProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class IntValueStyleItemProvider extends NamedStyleItemProvider {

@@ -37,7 +36,6 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IntValueStyleItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This adds a property descriptor for the Int Value feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addIntValuePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_IntValueStyle_intValue_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_IntValueStyle_intValue_feature", "_UI_IntValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.INT_VALUE_STYLE__INT_VALUE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_IntValueStyle_intValue_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_IntValueStyle_intValue_feature", "_UI_IntValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.INT_VALUE_STYLE__INT_VALUE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns IntValueStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,15 +95,14 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((IntValueStyle) object).getName();

+		String label = ((IntValueStyle)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_IntValueStyle_type") : //$NON-NLS-1$

-				getString("_UI_IntValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_IntValueStyle_type") : //$NON-NLS-1$

+			getString("_UI_IntValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -116,7 +110,6 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -124,9 +117,9 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(IntValueStyle.class)) {

-		case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -136,7 +129,6 @@ public class IntValueStyleItemProvider extends NamedStyleItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java
index 54e306d97d5..caa93d74e03 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NamedStyleItemProvider.java
@@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NamedStyleItemProvider extends EModelElementItemProvider {

@@ -40,7 +39,6 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NamedStyleItemProvider(AdapterFactory adapterFactory) {

@@ -51,7 +49,6 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -68,30 +65,28 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
 	 * 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_NamedStyle_name_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_NamedStyle_name_feature", "_UI_NamedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.NAMED_STYLE__NAME,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_NamedStyle_name_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_NamedStyle_name_feature", "_UI_NamedStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.NAMED_STYLE__NAME,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns NamedStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -103,15 +98,14 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((NamedStyle) object).getName();

+		String label = ((NamedStyle)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_NamedStyle_type") : //$NON-NLS-1$

-				getString("_UI_NamedStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_NamedStyle_type") : //$NON-NLS-1$

+			getString("_UI_NamedStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -119,7 +113,6 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -127,9 +120,9 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(NamedStyle.class)) {

-		case NattablestylePackage.NAMED_STYLE__NAME:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.NAMED_STYLE__NAME:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -139,7 +132,6 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -151,7 +143,6 @@ public class NamedStyleItemProvider extends EModelElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java
index b112ee8d917..464a24984ab 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/NattablestyleItemProviderAdapterFactory.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.util.Natt
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -47,7 +46,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -56,7 +54,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -65,7 +62,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -74,7 +70,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This constructs an instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattablestyleItemProviderAdapterFactory() {

@@ -89,7 +84,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NamedStyleItemProvider namedStyleItemProvider;

@@ -98,7 +92,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -114,7 +107,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected FontStyleItemProvider fontStyleItemProvider;

@@ -123,7 +115,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -139,7 +130,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected CellTextStyleItemProvider cellTextStyleItemProvider;

@@ -148,7 +138,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -164,7 +153,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IntValueStyleItemProvider intValueStyleItemProvider;

@@ -173,7 +161,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -189,7 +176,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IntListValueStyleItemProvider intListValueStyleItemProvider;

@@ -198,7 +184,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -214,7 +199,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected BooleanValueStyleItemProvider booleanValueStyleItemProvider;

@@ -223,7 +207,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -239,7 +222,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected BooleanListValueStyleItemProvider booleanListValueStyleItemProvider;

@@ -248,7 +230,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -264,7 +245,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected DoubleValueStyleItemProvider doubleValueStyleItemProvider;

@@ -273,7 +253,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -289,7 +268,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected DoubleListValueStyleItemProvider doubleListValueStyleItemProvider;

@@ -298,7 +276,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -314,7 +291,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected StringValueStyleItemProvider stringValueStyleItemProvider;

@@ -323,7 +299,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -339,7 +314,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected StringListValueStyleItemProvider stringListValueStyleItemProvider;

@@ -348,7 +322,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -364,7 +337,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableDisplayStyleItemProvider tableDisplayStyleItemProvider;

@@ -373,7 +345,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -389,7 +360,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObjectValueStyleItemProvider eObjectValueStyleItemProvider;

@@ -398,7 +368,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -414,7 +383,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObjectListValueStyleItemProvider eObjectListValueStyleItemProvider;

@@ -423,7 +391,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -439,7 +406,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This returns the root adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -451,7 +417,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This sets the composed adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -462,7 +427,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -474,7 +438,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -485,14 +448,13 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

 		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -504,7 +466,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This adds a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -516,7 +477,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This removes a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -528,7 +488,6 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -541,41 +500,26 @@ public class NattablestyleItemProviderAdapterFactory extends NattablestyleAdapte
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory.

+	 * This disposes all of the item providers created by this factory. 

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void dispose() {

-		if (namedStyleItemProvider != null)

-			namedStyleItemProvider.dispose();

-		if (fontStyleItemProvider != null)

-			fontStyleItemProvider.dispose();

-		if (cellTextStyleItemProvider != null)

-			cellTextStyleItemProvider.dispose();

-		if (intValueStyleItemProvider != null)

-			intValueStyleItemProvider.dispose();

-		if (intListValueStyleItemProvider != null)

-			intListValueStyleItemProvider.dispose();

-		if (booleanValueStyleItemProvider != null)

-			booleanValueStyleItemProvider.dispose();

-		if (booleanListValueStyleItemProvider != null)

-			booleanListValueStyleItemProvider.dispose();

-		if (doubleValueStyleItemProvider != null)

-			doubleValueStyleItemProvider.dispose();

-		if (doubleListValueStyleItemProvider != null)

-			doubleListValueStyleItemProvider.dispose();

-		if (stringValueStyleItemProvider != null)

-			stringValueStyleItemProvider.dispose();

-		if (stringListValueStyleItemProvider != null)

-			stringListValueStyleItemProvider.dispose();

-		if (tableDisplayStyleItemProvider != null)

-			tableDisplayStyleItemProvider.dispose();

-		if (eObjectValueStyleItemProvider != null)

-			eObjectValueStyleItemProvider.dispose();

-		if (eObjectListValueStyleItemProvider != null)

-			eObjectListValueStyleItemProvider.dispose();

+		if (namedStyleItemProvider != null) namedStyleItemProvider.dispose();

+		if (fontStyleItemProvider != null) fontStyleItemProvider.dispose();

+		if (cellTextStyleItemProvider != null) cellTextStyleItemProvider.dispose();

+		if (intValueStyleItemProvider != null) intValueStyleItemProvider.dispose();

+		if (intListValueStyleItemProvider != null) intListValueStyleItemProvider.dispose();

+		if (booleanValueStyleItemProvider != null) booleanValueStyleItemProvider.dispose();

+		if (booleanListValueStyleItemProvider != null) booleanListValueStyleItemProvider.dispose();

+		if (doubleValueStyleItemProvider != null) doubleValueStyleItemProvider.dispose();

+		if (doubleListValueStyleItemProvider != null) doubleListValueStyleItemProvider.dispose();

+		if (stringValueStyleItemProvider != null) stringValueStyleItemProvider.dispose();

+		if (stringListValueStyleItemProvider != null) stringListValueStyleItemProvider.dispose();

+		if (tableDisplayStyleItemProvider != null) tableDisplayStyleItemProvider.dispose();

+		if (eObjectValueStyleItemProvider != null) eObjectValueStyleItemProvider.dispose();

+		if (eObjectListValueStyleItemProvider != null) eObjectListValueStyleItemProvider.dispose();

 	}

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java
index 7b157b897bd..544e4d5db2e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringListValueStyleItemProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringLis
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class StringListValueStyleItemProvider extends NamedStyleItemProvider {

@@ -37,7 +36,6 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public StringListValueStyleItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This adds a property descriptor for the String List Value feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addStringListValuePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_StringListValueStyle_stringListValue_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_StringListValueStyle_stringListValue_feature", "_UI_StringListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_StringListValueStyle_stringListValue_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_StringListValueStyle_stringListValue_feature", "_UI_StringListValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns StringListValueStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,15 +95,14 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((StringListValueStyle) object).getName();

+		String label = ((StringListValueStyle)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_StringListValueStyle_type") : //$NON-NLS-1$

-				getString("_UI_StringListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_StringListValueStyle_type") : //$NON-NLS-1$

+			getString("_UI_StringListValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -116,7 +110,6 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -124,9 +117,9 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(StringListValueStyle.class)) {

-		case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -136,7 +129,6 @@ public class StringListValueStyleItemProvider extends NamedStyleItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java
index 734a78fe206..35f9a3a0bfd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StringValueStyleItemProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringVal
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class StringValueStyleItemProvider extends NamedStyleItemProvider {

@@ -37,7 +36,6 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public StringValueStyleItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This adds a property descriptor for the String Value feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addStringValuePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_StringValueStyle_stringValue_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_StringValueStyle_stringValue_feature", "_UI_StringValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.STRING_VALUE_STYLE__STRING_VALUE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_StringValueStyle_stringValue_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_StringValueStyle_stringValue_feature", "_UI_StringValueStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.STRING_VALUE_STYLE__STRING_VALUE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns StringValueStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,15 +95,14 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((StringValueStyle) object).getName();

+		String label = ((StringValueStyle)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_StringValueStyle_type") : //$NON-NLS-1$

-				getString("_UI_StringValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_StringValueStyle_type") : //$NON-NLS-1$

+			getString("_UI_StringValueStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -116,7 +110,6 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -124,9 +117,9 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(StringValueStyle.class)) {

-		case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -136,7 +129,6 @@ public class StringValueStyleItemProvider extends NamedStyleItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java
index 283e9721403..0f9de3d8b63 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/StyledElementItemProvider.java
@@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class StyledElementItemProvider extends EModelElementItemProvider {

@@ -40,7 +39,6 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public StyledElementItemProvider(AdapterFactory adapterFactory) {

@@ -51,7 +49,6 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -64,11 +61,11 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
 	}

 

 	/**

-	 * 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

+	 * 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

 	 */

 	@Override

@@ -83,7 +80,6 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -98,7 +94,6 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -111,7 +106,6 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -119,9 +113,9 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(StyledElement.class)) {

-		case NattablestylePackage.STYLED_ELEMENT__STYLES:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case NattablestylePackage.STYLED_ELEMENT__STYLES:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -131,7 +125,6 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -139,81 +132,80 @@ public class StyledElementItemProvider extends EModelElementItemProvider {
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createNamedStyle()));

+				 NattablestyleFactory.eINSTANCE.createNamedStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createFontStyle()));

+				 NattablestyleFactory.eINSTANCE.createFontStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createCellTextStyle()));

+				 NattablestyleFactory.eINSTANCE.createCellTextStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createIntValueStyle()));

+				 NattablestyleFactory.eINSTANCE.createIntValueStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createIntListValueStyle()));

+				 NattablestyleFactory.eINSTANCE.createIntListValueStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createBooleanValueStyle()));

+				 NattablestyleFactory.eINSTANCE.createBooleanValueStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createBooleanListValueStyle()));

+				 NattablestyleFactory.eINSTANCE.createBooleanListValueStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createDoubleValueStyle()));

+				 NattablestyleFactory.eINSTANCE.createDoubleValueStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createDoubleListValueStyle()));

+				 NattablestyleFactory.eINSTANCE.createDoubleListValueStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createStringValueStyle()));

+				 NattablestyleFactory.eINSTANCE.createStringValueStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createStringListValueStyle()));

+				 NattablestyleFactory.eINSTANCE.createStringListValueStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createTableDisplayStyle()));

+				 NattablestyleFactory.eINSTANCE.createTableDisplayStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createEObjectValueStyle()));

+				 NattablestyleFactory.eINSTANCE.createEObjectValueStyle()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablestylePackage.Literals.STYLED_ELEMENT__STYLES,

-						NattablestyleFactory.eINSTANCE.createEObjectListValueStyle()));

+				 NattablestyleFactory.eINSTANCE.createEObjectListValueStyle()));

 	}

 

 	/**

 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java
index 9234ece2439..10ef82c8323 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/provider/TableDisplayStyleItemProvider.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class TableDisplayStyleItemProvider extends EModelElementItemProvider {

@@ -41,7 +40,6 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public TableDisplayStyleItemProvider(AdapterFactory adapterFactory) {

@@ -52,7 +50,6 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -69,30 +66,28 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
 	 * This adds a property descriptor for the Display Style feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addDisplayStylePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_TableDisplayStyle_displayStyle_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_TableDisplayStyle_displayStyle_feature", "_UI_TableDisplayStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablestylePackage.Literals.TABLE_DISPLAY_STYLE__DISPLAY_STYLE,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_TableDisplayStyle_displayStyle_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TableDisplayStyle_displayStyle_feature", "_UI_TableDisplayStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablestylePackage.Literals.TABLE_DISPLAY_STYLE__DISPLAY_STYLE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns TableDisplayStyle.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -104,16 +99,15 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		DisplayStyle labelValue = ((TableDisplayStyle) object).getDisplayStyle();

+		DisplayStyle labelValue = ((TableDisplayStyle)object).getDisplayStyle();

 		String label = labelValue == null ? null : labelValue.toString();

 		return label == null || label.length() == 0 ?

-				getString("_UI_TableDisplayStyle_type") : //$NON-NLS-1$

-				getString("_UI_TableDisplayStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_TableDisplayStyle_type") : //$NON-NLS-1$

+			getString("_UI_TableDisplayStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -121,7 +115,6 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -129,9 +122,9 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(TableDisplayStyle.class)) {

-		case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -141,7 +134,6 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -153,7 +145,6 @@ public class TableDisplayStyleItemProvider extends EModelElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java
index 01b937709f6..50903f5438c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java
@@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPl
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class AbstractTableTesterItemProvider extends StyledElementItemProvider {

@@ -35,7 +34,6 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AbstractTableTesterItemProvider(AdapterFactory adapterFactory) {

@@ -46,7 +44,6 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -62,7 +59,6 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -76,7 +72,6 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -90,7 +85,6 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -102,7 +96,6 @@ public class AbstractTableTesterItemProvider extends StyledElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
index 866f2d99834..cdd91977184 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider {

@@ -37,7 +36,6 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public JavaTableTesterItemProvider(AdapterFactory adapterFactory) {

@@ -48,7 +46,6 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -65,30 +62,28 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
 	 * 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_JavaTableTester_tester_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_JavaTableTester_tester_feature", "_UI_JavaTableTester_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattabletesterPackage.Literals.JAVA_TABLE_TESTER__TESTER,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_JavaTableTester_tester_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_JavaTableTester_tester_feature", "_UI_JavaTableTester_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattabletesterPackage.Literals.JAVA_TABLE_TESTER__TESTER,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This returns JavaTableTester.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -100,15 +95,14 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((JavaTableTester) object).getTester();

+		String label = ((JavaTableTester)object).getTester();

 		return label == null || label.length() == 0 ?

-				getString("_UI_JavaTableTester_type") : //$NON-NLS-1$

-				getString("_UI_JavaTableTester_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_JavaTableTester_type") : //$NON-NLS-1$

+			getString("_UI_JavaTableTester_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -117,7 +111,6 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -125,9 +118,9 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(JavaTableTester.class)) {

-		case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -137,7 +130,6 @@ public class JavaTableTesterItemProvider extends AbstractTableTesterItemProvider
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
index d7af2f8972a..cba2f12654f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util.Nat
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +45,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -55,7 +53,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -64,7 +61,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -73,7 +69,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This constructs an instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattabletesterItemProviderAdapterFactory() {

@@ -88,7 +83,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected JavaTableTesterItemProvider javaTableTesterItemProvider;

@@ -97,7 +91,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -113,7 +106,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This returns the root adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -125,7 +117,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This sets the composed adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -136,7 +127,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -148,7 +138,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -159,14 +148,13 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

 		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -178,7 +166,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This adds a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -190,7 +177,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This removes a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -202,7 +188,6 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -215,16 +200,14 @@ public class NattabletesterItemProviderAdapterFactory extends NattabletesterAdap
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory.

+	 * This disposes all of the item providers created by this factory. 

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void dispose() {

-		if (javaTableTesterItemProvider != null)

-			javaTableTesterItemProvider.dispose();

+		if (javaTableTesterItemProvider != null) javaTableTesterItemProvider.dispose();

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
index 5f16b2feff7..cfec4bd57bc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
  * This is the central singleton for the Nattable edit plugin.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public final class NattableEditPlugin extends EMFPlugin {

@@ -29,7 +28,6 @@ public final class NattableEditPlugin extends EMFPlugin {
 	 * Keep track of the singleton.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final NattableEditPlugin INSTANCE = new NattableEditPlugin();

@@ -38,7 +36,6 @@ public final class NattableEditPlugin extends EMFPlugin {
 	 * Keep track of the singleton.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static Implementation plugin;

@@ -47,20 +44,19 @@ public final class NattableEditPlugin extends EMFPlugin {
 	 * Create the instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableEditPlugin() {

-		super(new ResourceLocator[] {

-				EcoreEditPlugin.INSTANCE,

-		});

+		super

+		  (new ResourceLocator [] {

+		     EcoreEditPlugin.INSTANCE,

+		   });

 	}

 

 	/**

 	 * Returns the singleton instance of the Eclipse plugin.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @return the singleton instance.

 	 * @generated

 	 */

@@ -73,7 +69,6 @@ public final class NattableEditPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @return the singleton instance.

 	 * @generated

 	 */

@@ -85,7 +80,6 @@ public final class NattableEditPlugin extends EMFPlugin {
 	 * The actual implementation of the Eclipse <b>Plugin</b>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static class Implementation extends EclipsePlugin {

@@ -94,7 +88,6 @@ public final class NattableEditPlugin extends EMFPlugin {
 		 * Creates an instance.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public Implementation() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
index 0a71092abec..ef9b3e80114 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableAdapterFac
  * Note that most of the adapters are shared among multiple instances.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableItemProviderAdapterFactory extends NattableAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

@@ -46,7 +45,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

@@ -55,7 +53,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

@@ -64,7 +61,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

@@ -73,7 +69,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This constructs an instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableItemProviderAdapterFactory() {

@@ -88,7 +83,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableItemProvider tableItemProvider;

@@ -97,7 +91,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -113,7 +106,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This returns the root adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -125,7 +117,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This sets the composed adapter factory that contains this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -136,7 +127,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -148,7 +138,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This implementation substitutes the factory itself as the key for the adapter.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -159,14 +148,13 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public Object adapt(Object object, Object type) {

 		if (isFactoryForType(type)) {

 			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

 				return adapter;

 			}

 		}

@@ -178,7 +166,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This adds a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -190,7 +177,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This removes a listener.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -202,7 +188,6 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -215,16 +200,14 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory.

+	 * This disposes all of the item providers created by this factory. 

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void dispose() {

-		if (tableItemProvider != null)

-			tableItemProvider.dispose();

+		if (tableItemProvider != null) tableItemProvider.dispose();

 	}

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
index eeaf0622f1b..9b9d211c77a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
@@ -35,7 +35,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.p
  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class TableItemProvider extends TableNamedElementItemProvider {

@@ -43,7 +42,6 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public TableItemProvider(AdapterFactory adapterFactory) {

@@ -54,7 +52,6 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 	 * This returns the property descriptors for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -77,169 +74,162 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 	 * This adds a property descriptor for the Context feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addContextPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Table_context_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_Table_context_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablePackage.Literals.TABLE__CONTEXT,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Table_context_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_Table_context_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablePackage.Literals.TABLE__CONTEXT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Owner feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addOwnerPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Table_owner_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_Table_owner_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablePackage.Literals.TABLE__OWNER,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Table_owner_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_Table_owner_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablePackage.Literals.TABLE__OWNER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Prototype feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addPrototypePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Table_prototype_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_Table_prototype_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablePackage.Literals.TABLE__PROTOTYPE,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Table_prototype_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_Table_prototype_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablePackage.Literals.TABLE__PROTOTYPE,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Table Configuration feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addTableConfigurationPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Table_tableConfiguration_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_Table_tableConfiguration_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablePackage.Literals.TABLE__TABLE_CONFIGURATION,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Table_tableConfiguration_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_Table_tableConfiguration_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablePackage.Literals.TABLE__TABLE_CONFIGURATION,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Invert Axis feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addInvertAxisPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Table_invertAxis_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_Table_invertAxis_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablePackage.Literals.TABLE__INVERT_AXIS,

-						true,

-						false,

-						false,

-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Table_invertAxis_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_Table_invertAxis_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablePackage.Literals.TABLE__INVERT_AXIS,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Current Row Axis Provider feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addCurrentRowAxisProviderPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Table_currentRowAxisProvider_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_Table_currentRowAxisProvider_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablePackage.Literals.TABLE__CURRENT_ROW_AXIS_PROVIDER,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Table_currentRowAxisProvider_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_Table_currentRowAxisProvider_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablePackage.Literals.TABLE__CURRENT_ROW_AXIS_PROVIDER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

 	 * This adds a property descriptor for the Current Column Axis Provider feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void addCurrentColumnAxisProviderPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

-				(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-						getResourceLocator(),

-						getString("_UI_Table_currentColumnAxisProvider_feature"), //$NON-NLS-1$

-						getString("_UI_PropertyDescriptor_description", "_UI_Table_currentColumnAxisProvider_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-						NattablePackage.Literals.TABLE__CURRENT_COLUMN_AXIS_PROVIDER,

-						true,

-						false,

-						true,

-						null,

-						null,

-						null));

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Table_currentColumnAxisProvider_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_Table_currentColumnAxisProvider_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablePackage.Literals.TABLE__CURRENT_COLUMN_AXIS_PROVIDER,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

 	}

 

 	/**

-	 * 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

+	 * 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

 	 */

 	@Override

@@ -258,7 +248,6 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -273,7 +262,6 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 	 * This returns Table.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -285,15 +273,14 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 	 * This returns the label text for the adapted class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((Table) object).getName();

+		String label = ((Table)object).getName();

 		return label == null || label.length() == 0 ?

-				getString("_UI_Table_type") : //$NON-NLS-1$

-				getString("_UI_Table_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_Table_type") : //$NON-NLS-1$

+			getString("_UI_Table_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 

@@ -302,7 +289,6 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -310,16 +296,16 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(Table.class)) {

-		case NattablePackage.TABLE__INVERT_AXIS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-		case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-		case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-		case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-		case NattablePackage.TABLE__CELLS:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

+			case NattablePackage.TABLE__INVERT_AXIS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

+			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

+			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

+			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

+			case NattablePackage.TABLE__CELLS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

 		}

 		super.notifyChanged(notification);

 	}

@@ -329,7 +315,6 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 	 * that can be created under this object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -337,46 +322,45 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 		super.collectNewChildDescriptors(newChildDescriptors, object);

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablePackage.Literals.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY,

-						NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

+				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablePackage.Literals.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY,

-						NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

+				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablePackage.Literals.TABLE__ROW_AXIS_PROVIDERS_HISTORY,

-						NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

+				 NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablePackage.Literals.TABLE__ROW_AXIS_PROVIDERS_HISTORY,

-						NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

+				 NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablePackage.Literals.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION,

-						NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration()));

+				 NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablePackage.Literals.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION,

-						NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration()));

+				 NattableaxisconfigurationFactory.eINSTANCE.createLocalTableHeaderAxisConfiguration()));

 

 		newChildDescriptors.add

-				(createChildParameter

+			(createChildParameter

 				(NattablePackage.Literals.TABLE__CELLS,

-						NattablecellFactory.eINSTANCE.createCell()));

+				 NattablecellFactory.eINSTANCE.createCell()));

 	}

 

 	/**

 	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -385,14 +369,15 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 		Object childObject = child;

 

 		boolean qualify =

-				childFeature == NattablePackage.Literals.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY ||

-						childFeature == NattablePackage.Literals.TABLE__ROW_AXIS_PROVIDERS_HISTORY ||

-						childFeature == NattablePackage.Literals.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION ||

-						childFeature == NattablePackage.Literals.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION;

+			childFeature == NattablePackage.Literals.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY ||

+			childFeature == NattablePackage.Literals.TABLE__ROW_AXIS_PROVIDERS_HISTORY ||

+			childFeature == NattablePackage.Literals.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION ||

+			childFeature == NattablePackage.Literals.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION;

 

 		if (qualify) {

-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$

-					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

+			return getString

+				("_UI_CreateChild_text2", //$NON-NLS-1$

+				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

 		}

 		return super.getCreateChildText(owner, feature, child, selection);

 	}

@@ -401,7 +386,6 @@ public class TableItemProvider extends TableNamedElementItemProvider {
 	 * Return the resource locator for this item provider's resources.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
index 8b33390c220..14cfd8b0610 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
@@ -142,4 +142,4 @@ _UI_FileConflict_label = File Conflict
 _WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?

 

 

-pluginDescription=This plugin provides the editor to create table configuration.
\ No newline at end of file
+pluginDescription=This plugin provides the editor to create table configuration.

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
index 41214376a76..a27e93ff8e6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
@@ -49,7 +49,6 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattableaxis model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableaxisActionBarContributor

@@ -59,7 +58,6 @@ public class NattableaxisActionBarContributor
 	 * This keeps track of the active editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IEditorPart activeEditorPart;

@@ -68,7 +66,6 @@ public class NattableaxisActionBarContributor
 	 * This keeps track of the current selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionProvider selectionProvider;

@@ -77,56 +74,53 @@ public class NattableaxisActionBarContributor
 	 * 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);

-					}

+		{

+			@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 boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

 

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

+			@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;

@@ -135,7 +129,6 @@ public class NattableaxisActionBarContributor
 	 * 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;

@@ -145,7 +138,6 @@ public class NattableaxisActionBarContributor
 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createSiblingActions;

@@ -154,7 +146,6 @@ public class NattableaxisActionBarContributor
 	 * 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;

@@ -163,7 +154,6 @@ public class NattableaxisActionBarContributor
 	 * This creates an instance of the contributor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableaxisActionBarContributor() {

@@ -177,7 +167,6 @@ public class NattableaxisActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -191,7 +180,6 @@ public class NattableaxisActionBarContributor
 	 * as well as the sub-menus for object creation items.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -218,11 +206,11 @@ public class NattableaxisActionBarContributor
 		// Force an update because Eclipse hides empty menus now.

 		//

 		submenuManager.addMenuListener

-				(new IMenuListener() {

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

 

 		addGlobalActions(submenuManager);

 	}

@@ -231,7 +219,6 @@ public class NattableaxisActionBarContributor
 	 * 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

@@ -265,7 +252,6 @@ public class NattableaxisActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -285,10 +271,10 @@ public class NattableaxisActionBarContributor
 		Collection<?> newSiblingDescriptors = null;

 

 		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

 

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

 

 			newChildDescriptors = domain.getNewChildDescriptors(object, null);

 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

@@ -314,7 +300,6 @@ public class NattableaxisActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

@@ -332,7 +317,6 @@ public class NattableaxisActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

@@ -352,7 +336,6 @@ public class NattableaxisActionBarContributor
 	 * 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) {

@@ -373,7 +356,6 @@ public class NattableaxisActionBarContributor
 	 * 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) {

@@ -384,13 +366,13 @@ public class NattableaxisActionBarContributor
 				//

 				IContributionItem contributionItem = items[i];

 				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

 				}

 

 				// Delete the ActionContributionItems with matching action.

 				//

 				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

 					if (actions.contains(action)) {

 						manager.remove(contributionItem);

 					}

@@ -403,7 +385,6 @@ public class NattableaxisActionBarContributor
 	 * This populates the pop-up menu before it appears.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -424,7 +405,6 @@ public class NattableaxisActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -432,7 +412,7 @@ public class NattableaxisActionBarContributor
 		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());

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

 		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

 

 		super.addGlobalActions(menuManager);

@@ -442,7 +422,6 @@ public class NattableaxisActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
index 033826d6ab3..8c8d19442f0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
@@ -145,7 +145,6 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattableaxis model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableaxisEditor

@@ -155,7 +154,6 @@ public class NattableaxisEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AdapterFactoryEditingDomain editingDomain;

@@ -164,7 +162,6 @@ public class NattableaxisEditor
 	 * This is the one adapter factory used for providing views of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory adapterFactory;

@@ -173,7 +170,6 @@ public class NattableaxisEditor
 	 * This is the content outline page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IContentOutlinePage contentOutlinePage;

@@ -182,7 +178,6 @@ public class NattableaxisEditor
 	 * This is a kludge...

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStatusLineManager contentOutlineStatusLineManager;

@@ -191,7 +186,6 @@ public class NattableaxisEditor
 	 * This is the content outline page's viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer contentOutlineViewer;

@@ -200,7 +194,6 @@ public class NattableaxisEditor
 	 * This is the property sheet page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

@@ -210,7 +203,6 @@ public class NattableaxisEditor
 	 * The parent relation must be correctly defined for this to work.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer selectionViewer;

@@ -219,7 +211,6 @@ public class NattableaxisEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer parentViewer;

@@ -228,7 +219,6 @@ public class NattableaxisEditor
 	 * This shows how a tree view works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewer;

@@ -238,7 +228,6 @@ public class NattableaxisEditor
 	 * A list viewer doesn't support icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ListViewer listViewer;

@@ -248,7 +237,6 @@ public class NattableaxisEditor
 	 * A table can be used as a list with icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableViewer tableViewer;

@@ -257,7 +245,6 @@ public class NattableaxisEditor
 	 * This shows how a tree view with columns works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewerWithColumns;

@@ -266,7 +253,6 @@ public class NattableaxisEditor
 	 * This keeps track of the active viewer pane, in the book.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ViewerPane currentViewerPane;

@@ -275,7 +261,6 @@ public class NattableaxisEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Viewer currentViewer;

@@ -284,7 +269,6 @@ public class NattableaxisEditor
 	 * This listens to which ever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionChangedListener selectionChangedListener;

@@ -293,7 +277,6 @@ public class NattableaxisEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

@@ -302,7 +285,6 @@ public class NattableaxisEditor
 	 * This keeps track of the selection of the editor as a whole.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelection editorSelection = StructuredSelection.EMPTY;

@@ -312,7 +294,6 @@ public class NattableaxisEditor
 	 * in Eclipse's Problems View.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

@@ -321,52 +302,46 @@ public class NattableaxisEditor
 	 * This listens for when the outline becomes active

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IPartListener partListener =

 			new IPartListener() {

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(NattableaxisEditor.this);

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(NattableaxisEditor.this);

 

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(NattableaxisEditor.this);

-							handleActivate();

-						}

+						setCurrentViewer(contentOutlineViewer);

 					}

-					else if (p == NattableaxisEditor.this) {

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(NattableaxisEditor.this);

 						handleActivate();

 					}

 				}

-

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

+				else if (p == NattableaxisEditor.this) {

+					handleActivate();

 				}

-

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

 

 	/**

 	 * Resources that have been removed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> removedResources = new ArrayList<Resource>();

@@ -375,7 +350,6 @@ public class NattableaxisEditor
 	 * Resources that have been changed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> changedResources = new ArrayList<Resource>();

@@ -384,7 +358,6 @@ public class NattableaxisEditor
 	 * Resources that have been saved.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> savedResources = new ArrayList<Resource>();

@@ -393,7 +366,6 @@ public class NattableaxisEditor
 	 * Map to store the diagnostic associated with a resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

@@ -402,7 +374,6 @@ public class NattableaxisEditor
 	 * Controls whether the problem indication should be updated.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean updateProblemIndication = true;

@@ -411,19 +382,18 @@ public class NattableaxisEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EContentAdapter problemIndicationAdapter =

 			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

 						case Resource.RESOURCE__IS_LOADED:

 						case Resource.RESOURCE__ERRORS:

 						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

+							Resource resource = (Resource)notification.getNotifier();

 							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

 							if (diagnostic.getSeverity() != Diagnostic.OK) {

 								resourceToDiagnosticMap.put(resource, diagnostic);

@@ -434,136 +404,134 @@ public class NattableaxisEditor
 

 							if (updateProblemIndication) {

 								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											public void run() {

-												updateProblemIndication();

-											}

-										});

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

 							}

 							break;

 						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

 					}

 				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

+				else {

+					super.notifyChanged(notification);

 				}

+			}

 

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

 				}

-			};

+			}

+		};

 

 	/**

 	 * This listens for workspace changes.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IResourceChangeListener resourceChangeListener =

 			new IResourceChangeListener() {

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

 										}

 									}

-									return false;

 								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

+								return false;

 							}

 

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

+							return true;

 						}

 

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(NattableaxisEditor.this, false);

-											}

-										}

-									});

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

 						}

 

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == NattableaxisEditor.this) {

-												handleActivate();

-											}

-										}

-									});

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

 						}

 					}

-					catch (CoreException exception) {

-						NattableEditorPlugin.INSTANCE.log(exception);

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(NattableaxisEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == NattableaxisEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

 					}

 				}

-			};

+				catch (CoreException exception) {

+					NattableEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

 

 	/**

 	 * Handles activation of the editor or it's associated views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleActivate() {

 		// Recompute the read only state.

 		//

 		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

+		  editingDomain.getResourceToReadOnlyMap().clear();

 

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

 		}

 

 		if (!removedResources.isEmpty()) {

@@ -588,7 +556,6 @@ public class NattableaxisEditor
 	 * Handles what to do with changed resources on activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleChangedResources() {

@@ -604,7 +571,8 @@ public class NattableaxisEditor
 					resource.unload();

 					try {

 						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

+					}

+					catch (IOException exception) {

 						if (!resourceToDiagnosticMap.containsKey(resource)) {

 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

@@ -625,17 +593,17 @@ public class NattableaxisEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void updateProblemIndication() {

 		if (updateProblemIndication) {

 			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

 			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

 				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

 					diagnostic.add(childDiagnostic);

@@ -644,7 +612,7 @@ public class NattableaxisEditor
 

 			int lastEditorPage = getPageCount() - 1;

 			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					setActivePage(lastEditorPage);

 				}

@@ -658,7 +626,8 @@ public class NattableaxisEditor
 					setPageText(lastEditorPage, problemEditorPart.getPartName());

 					setActivePage(lastEditorPage);

 					showTabs();

-				} catch (PartInitException exception) {

+				}

+				catch (PartInitException exception) {

 					NattableEditorPlugin.INSTANCE.log(exception);

 				}

 			}

@@ -668,7 +637,8 @@ public class NattableaxisEditor
 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					try {

 						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

+					}

+					catch (CoreException exception) {

 						NattableEditorPlugin.INSTANCE.log(exception);

 					}

 				}

@@ -680,21 +650,20 @@ public class NattableaxisEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

+		return

+			MessageDialog.openQuestion

 				(getSite().getShell(),

-						getString("_UI_FileConflict_label"), //$NON-NLS-1$

-						getString("_WARN_FileConflict")); //$NON-NLS-1$

+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

+				 getString("_WARN_FileConflict")); //$NON-NLS-1$

 	}

 

 	/**

 	 * This creates a model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableaxisEditor() {

@@ -706,7 +675,6 @@ public class NattableaxisEditor
 	 * This sets up the editing domain for the model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void initializeEditingDomain() {

@@ -735,32 +703,32 @@ public class NattableaxisEditor
 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

 		//

 		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

 

 		// Create the editing domain with a special command stack.

 		//

@@ -771,7 +739,6 @@ public class NattableaxisEditor
 	 * This is here for the listener to be able to call it.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -783,7 +750,6 @@ public class NattableaxisEditor
 	 * This sets the selection into whichever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setSelectionToViewer(Collection<?> collection) {

@@ -792,25 +758,25 @@ public class NattableaxisEditor
 		//

 		if (theSelection != null && !theSelection.isEmpty()) {

 			Runnable runnable =

-					new Runnable() {

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

 						}

-					};

+					}

+				};

 			getSite().getShell().getDisplay().asyncExec(runnable);

 		}

 	}

 

 	/**

 	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -821,14 +787,12 @@ public class NattableaxisEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

@@ -838,11 +802,10 @@ public class NattableaxisEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getElements(Object object) {

+		public Object [] getElements(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -850,11 +813,10 @@ public class NattableaxisEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getChildren(Object object) {

+		public Object [] getChildren(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -862,7 +824,6 @@ public class NattableaxisEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -874,7 +835,6 @@ public class NattableaxisEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -886,7 +846,6 @@ public class NattableaxisEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewerPane(ViewerPane viewerPane) {

@@ -904,7 +863,6 @@ public class NattableaxisEditor
 	 * is the current one.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewer(Viewer viewer) {

@@ -915,13 +873,13 @@ public class NattableaxisEditor
 				// Create the listener on demand.

 				//

 				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

 			}

 

 			// Stop listening to the old one.

@@ -950,7 +908,6 @@ public class NattableaxisEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -962,7 +919,6 @@ public class NattableaxisEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void createContextMenuFor(StructuredViewer viewer) {

@@ -970,7 +926,7 @@ public class NattableaxisEditor
 		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

 		contextMenu.setRemoveAllWhenShown(true);

 		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

 		viewer.getControl().setMenu(menu);

 		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

 

@@ -984,25 +940,25 @@ public class NattableaxisEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

 		Exception exception = null;

 		Resource resource = null;

 		try {

 			// Load the resource through the editing domain.

 			//

 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

+		}

+		catch (Exception e) {

 			exception = e;

 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

 		}

 

 		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

 		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

 		}

 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

 	}

@@ -1012,25 +968,29 @@ public class NattableaxisEditor
 	 * and the specified exception (if any).

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+		boolean hasErrors = !resource.getErrors().isEmpty();

+		if (hasErrors || !resource.getWarnings().isEmpty()) {

 			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-							new Object[] { exception == null ? (Object) resource : exception });

+				new BasicDiagnostic

+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object [] { exception == null ? (Object)resource : exception });

 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

 			return basicDiagnostic;

 		}

 		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					new Object[] { exception });

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object[] { exception });

 		}

 		else {

 			return Diagnostic.OK_INSTANCE;

@@ -1041,7 +1001,6 @@ public class NattableaxisEditor
 	 * This is the method used by the framework to install your own controls.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1057,23 +1016,22 @@ public class NattableaxisEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

 				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 

 				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1092,23 +1050,22 @@ public class NattableaxisEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				parentViewer = (TreeViewer) viewerPane.getViewer();

+				parentViewer = (TreeViewer)viewerPane.getViewer();

 				parentViewer.setAutoExpandLevel(30);

 				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

 				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1122,20 +1079,19 @@ public class NattableaxisEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

+				listViewer = (ListViewer)viewerPane.getViewer();

 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1148,20 +1104,19 @@ public class NattableaxisEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

+				treeViewer = (TreeViewer)viewerPane.getViewer();

 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1176,20 +1131,19 @@ public class NattableaxisEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

+				tableViewer = (TableViewer)viewerPane.getViewer();

 

 				Table table = tableViewer.getTable();

 				TableLayout layout = new TableLayout();

@@ -1207,7 +1161,7 @@ public class NattableaxisEditor
 				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

 				selfColumn.setResizable(true);

 

-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1220,21 +1174,20 @@ public class NattableaxisEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

 

 				Tree tree = treeViewerWithColumns.getTree();

 				tree.setLayoutData(new FillLayout());

@@ -1251,7 +1204,7 @@ public class NattableaxisEditor
 				selfColumn.setResizable(true);

 				selfColumn.setWidth(200);

 

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1261,36 +1214,35 @@ public class NattableaxisEditor
 			}

 

 			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						public void run() {

-							setActivePage(0);

-						}

-					});

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

 		}

 

 		// Ensures that this editor will only display the page's tab

 		// area if there are more than one page

 		//

 		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

 					}

-				});

+				}

+			 });

 

 		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					public void run() {

-						updateProblemIndication();

-					}

-				});

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

 	}

 

 	/**

@@ -1298,14 +1250,13 @@ public class NattableaxisEditor
 	 * this hides the single tab at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void hideTabs() {

 		if (getPageCount() <= 1) {

 			setPageText(0, ""); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

+				((CTabFolder)getContainer()).setTabHeight(1);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y + 6);

 			}

@@ -1317,14 +1268,13 @@ public class NattableaxisEditor
 	 * this shows the tabs at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void showTabs() {

 		if (getPageCount() > 1) {

 			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y - 6);

 			}

@@ -1335,7 +1285,6 @@ public class NattableaxisEditor
 	 * This is used to track the active viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1351,7 +1300,6 @@ public class NattableaxisEditor
 	 * This is how the framework determines which interfaces we implement.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("rawtypes")

@@ -1375,7 +1323,6 @@ public class NattableaxisEditor
 	 * This accesses a cached version of the content outliner.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IContentOutlinePage getContentOutlinePage() {

@@ -1400,9 +1347,9 @@ public class NattableaxisEditor
 					createContextMenuFor(contentOutlineViewer);

 

 					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 					}

 				}

 

@@ -1424,13 +1371,13 @@ public class NattableaxisEditor
 			// Listen to selection so that we can handle it is a special way.

 			//

 			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

 		}

 

 		return contentOutlinePage;

@@ -1440,24 +1387,23 @@ public class NattableaxisEditor
 	 * This accesses a cached version of the property sheet.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

 		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						NattableaxisEditor.this.setSelectionToViewer(selection);

-						NattableaxisEditor.this.setFocus();

-					}

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					NattableaxisEditor.this.setSelectionToViewer(selection);

+					NattableaxisEditor.this.setFocus();

+				}

 

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

 		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

 		propertySheetPages.add(propertySheetPage);

 

@@ -1468,12 +1414,11 @@ public class NattableaxisEditor
 	 * This deals with how we want selection in the outliner to affect the other views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void handleContentOutlineSelection(ISelection selection) {

 		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

 			if (selectedElements.hasNext()) {

 				// Get the first selected element.

 				//

@@ -1508,19 +1453,17 @@ public class NattableaxisEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

 	}

 

 	/**

 	 * This is for implementing {@link IEditorPart} and simply saves the model file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1534,31 +1477,31 @@ public class NattableaxisEditor
 		// Do the work within an operation because this is a long running activity that modifies the workbench.

 		//

 		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

 					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

 								}

-								first = false;

 							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

 						}

 					}

-				};

+				}

+			};

 

 		updateProblemIndication = false;

 		try {

@@ -1568,9 +1511,10 @@ public class NattableaxisEditor
 

 			// Refresh the necessary state.

 			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

 			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			// Something went wrong that shouldn't.

 			//

 			NattableEditorPlugin.INSTANCE.log(exception);

@@ -1584,7 +1528,6 @@ public class NattableaxisEditor
 	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean isPersisted(Resource resource) {

@@ -1595,7 +1538,8 @@ public class NattableaxisEditor
 				result = true;

 				stream.close();

 			}

-		} catch (IOException e) {

+		}

+		catch (IOException e) {

 			// Ignore

 		}

 		return result;

@@ -1605,7 +1549,6 @@ public class NattableaxisEditor
 	 * This always returns true because it is not currently supported.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1617,7 +1560,6 @@ public class NattableaxisEditor
 	 * This also changes the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1636,7 +1578,6 @@ public class NattableaxisEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void doSaveAs(URI uri, IEditorInput editorInput) {

@@ -1644,16 +1585,15 @@ public class NattableaxisEditor
 		setInputWithNotify(editorInput);

 		setPartName(editorInput.getName());

 		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

 		doSave(progressMonitor);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1668,7 +1608,6 @@ public class NattableaxisEditor
 	 * This is called during startup.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1684,7 +1623,6 @@ public class NattableaxisEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1701,7 +1639,6 @@ public class NattableaxisEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1713,7 +1650,6 @@ public class NattableaxisEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1725,7 +1661,6 @@ public class NattableaxisEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1738,7 +1673,6 @@ public class NattableaxisEditor
 	 * Calling this result will notify the listeners.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1754,30 +1688,29 @@ public class NattableaxisEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setStatusLineManager(ISelection selection) {

 		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

 

 		if (statusLineManager != null) {

 			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

 				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-					break;

-				}

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

+						break;

+					}

 				}

 			}

 			else {

@@ -1790,7 +1723,6 @@ public class NattableaxisEditor
 	 * This looks up a string in the plugin's plugin.properties file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key) {

@@ -1801,39 +1733,35 @@ public class NattableaxisEditor
 	 * This looks up a string in plugin.properties, making a substitution.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

 	}

 

 	/**

 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IActionBars getActionBars() {

@@ -1843,7 +1771,6 @@ public class NattableaxisEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AdapterFactory getAdapterFactory() {

@@ -1853,7 +1780,6 @@ public class NattableaxisEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1885,7 +1811,6 @@ public class NattableaxisEditor
 	 * Returns whether the outline view should be presented to the user.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean showOutlineView() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
index 7133cfb3ec4..67b3a326b1a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
@@ -75,7 +75,6 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableaxisModelWizard extends Wizard implements INewWizard {

@@ -83,7 +82,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final List<String> FILE_EXTENSIONS =

@@ -93,7 +91,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final String FORMATTED_FILE_EXTENSIONS =

@@ -103,7 +100,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisPackage nattableaxisPackage = NattableaxisPackage.eINSTANCE;

@@ -112,7 +108,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisFactory nattableaxisFactory = nattableaxisPackage.getNattableaxisFactory();

@@ -121,7 +116,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisModelWizardNewFileCreationPage newFileCreationPage;

@@ -130,7 +124,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisModelWizardInitialObjectCreationPage initialObjectCreationPage;

@@ -139,7 +132,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStructuredSelection selection;

@@ -148,7 +140,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IWorkbench workbench;

@@ -157,7 +148,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<String> initialObjectNames;

@@ -166,7 +156,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -181,7 +170,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<String> getInitialObjectNames() {

@@ -189,7 +177,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 			initialObjectNames = new ArrayList<String>();

 			for (EClassifier eClassifier : nattableaxisPackage.getEClassifiers()) {

 				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

+					EClass eClass = (EClass)eClassifier;

 					if (!eClass.isAbstract()) {

 						initialObjectNames.add(eClass.getName());

 					}

@@ -204,11 +192,10 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObject createInitialModel() {

-		EClass eClass = (EClass) nattableaxisPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EClass eClass = (EClass)nattableaxisPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

 		EObject rootObject = nattableaxisFactory.create(eClass);

 		return rootObject;

 	}

@@ -217,7 +204,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -230,43 +216,43 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 			// Do the work within an operation.

 			//

 			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								NattableEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

 							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							NattableEditorPlugin.INSTANCE.log(exception);

 						}

-					};

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

 

 			getContainer().run(false, false, operation);

 

@@ -278,26 +264,28 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 			if (activePart instanceof ISetSelectionTarget) {

 				final ISelection targetSelection = new StructuredSelection(modelFile);

 				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

 			}

 

 			// Open an editor on the new file.

 			//

 			try {

 				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

 				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

 				return false;

 			}

 

 			return true;

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			NattableEditorPlugin.INSTANCE.log(exception);

 			return false;

 		}

@@ -307,7 +295,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableaxisModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

@@ -315,7 +302,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableaxisModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

@@ -326,7 +312,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -335,7 +320,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 				String extension = new Path(getFileName()).getFileExtension();

 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

 					return false;

 				}

 				return true;

@@ -346,7 +331,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public IFile getModelFile() {

@@ -358,14 +342,12 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableaxisModelWizardInitialObjectCreationPage extends WizardPage {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo initialObjectField;

@@ -380,7 +362,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo encodingField;

@@ -389,7 +370,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableaxisModelWizardInitialObjectCreationPage(String pageId) {

@@ -399,13 +379,11 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

 		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

+			Composite composite = new Composite(parent, SWT.NONE); {

 				GridLayout layout = new GridLayout();

 				layout.numColumns = 1;

 				layout.verticalSpacing = 12;

@@ -474,20 +452,18 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected ModifyListener validator =

 				new ModifyListener() {

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected boolean validatePage() {

@@ -497,7 +473,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -518,7 +493,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getInitialObjectName() {

@@ -535,7 +509,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getEncoding() {

@@ -546,13 +519,13 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected String getLabel(String typeName) {

 			try {

 				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (MissingResourceException mre) {

+			}

+			catch(MissingResourceException mre) {

 				NattableEditorPlugin.INSTANCE.log(mre);

 			}

 			return typeName;

@@ -561,13 +534,12 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Collection<String> getEncodings() {

 			if (encodings == null) {

 				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$

+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

 				{

 					encodings.add(stringTokenizer.nextToken());

 				}

@@ -580,7 +552,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -602,7 +573,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 			if (selectedElement instanceof IResource) {

 				// Get the resource parent, if its a file.

 				//

-				IResource selectedResource = (IResource) selectedElement;

+				IResource selectedResource = (IResource)selectedElement;

 				if (selectedResource.getType() == IResource.FILE) {

 					selectedResource = selectedResource.getParent();

 				}

@@ -619,7 +590,7 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisEditorFilenameDefaultBase"); //$NON-NLS-1$

 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

 					}

 					newFileCreationPage.setFileName(modelFilename);

@@ -636,7 +607,6 @@ public class NattableaxisModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IFile getModelFile() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
index fa0324020f3..ec5889db984 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
@@ -49,7 +49,6 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattableaxisconfiguration model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableaxisconfigurationActionBarContributor

@@ -59,7 +58,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This keeps track of the active editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IEditorPart activeEditorPart;

@@ -68,7 +66,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This keeps track of the current selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionProvider selectionProvider;

@@ -77,56 +74,53 @@ public class NattableaxisconfigurationActionBarContributor
 	 * 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);

-					}

+		{

+			@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 boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

 

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

+			@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;

@@ -135,7 +129,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * 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;

@@ -145,7 +138,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createSiblingActions;

@@ -154,7 +146,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * 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;

@@ -163,7 +154,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This creates an instance of the contributor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableaxisconfigurationActionBarContributor() {

@@ -177,7 +167,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -191,7 +180,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * as well as the sub-menus for object creation items.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -218,11 +206,11 @@ public class NattableaxisconfigurationActionBarContributor
 		// Force an update because Eclipse hides empty menus now.

 		//

 		submenuManager.addMenuListener

-				(new IMenuListener() {

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

 

 		addGlobalActions(submenuManager);

 	}

@@ -231,7 +219,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * 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

@@ -265,7 +252,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -285,10 +271,10 @@ public class NattableaxisconfigurationActionBarContributor
 		Collection<?> newSiblingDescriptors = null;

 

 		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

 

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

 

 			newChildDescriptors = domain.getNewChildDescriptors(object, null);

 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

@@ -314,7 +300,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

@@ -332,7 +317,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

@@ -352,7 +336,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * 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) {

@@ -373,7 +356,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * 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) {

@@ -384,13 +366,13 @@ public class NattableaxisconfigurationActionBarContributor
 				//

 				IContributionItem contributionItem = items[i];

 				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

 				}

 

 				// Delete the ActionContributionItems with matching action.

 				//

 				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

 					if (actions.contains(action)) {

 						manager.remove(contributionItem);

 					}

@@ -403,7 +385,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This populates the pop-up menu before it appears.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -424,7 +405,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -432,7 +412,7 @@ public class NattableaxisconfigurationActionBarContributor
 		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());

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

 		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

 

 		super.addGlobalActions(menuManager);

@@ -442,7 +422,6 @@ public class NattableaxisconfigurationActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
index 501d6d5e561..b92a92ae56b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
@@ -145,7 +145,6 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattableaxisconfiguration model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableaxisconfigurationEditor

@@ -155,7 +154,6 @@ public class NattableaxisconfigurationEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AdapterFactoryEditingDomain editingDomain;

@@ -164,7 +162,6 @@ public class NattableaxisconfigurationEditor
 	 * This is the one adapter factory used for providing views of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory adapterFactory;

@@ -173,7 +170,6 @@ public class NattableaxisconfigurationEditor
 	 * This is the content outline page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IContentOutlinePage contentOutlinePage;

@@ -182,7 +178,6 @@ public class NattableaxisconfigurationEditor
 	 * This is a kludge...

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStatusLineManager contentOutlineStatusLineManager;

@@ -191,7 +186,6 @@ public class NattableaxisconfigurationEditor
 	 * This is the content outline page's viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer contentOutlineViewer;

@@ -200,7 +194,6 @@ public class NattableaxisconfigurationEditor
 	 * This is the property sheet page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

@@ -210,7 +203,6 @@ public class NattableaxisconfigurationEditor
 	 * The parent relation must be correctly defined for this to work.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer selectionViewer;

@@ -219,7 +211,6 @@ public class NattableaxisconfigurationEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer parentViewer;

@@ -228,7 +219,6 @@ public class NattableaxisconfigurationEditor
 	 * This shows how a tree view works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewer;

@@ -238,7 +228,6 @@ public class NattableaxisconfigurationEditor
 	 * A list viewer doesn't support icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ListViewer listViewer;

@@ -248,7 +237,6 @@ public class NattableaxisconfigurationEditor
 	 * A table can be used as a list with icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableViewer tableViewer;

@@ -257,7 +245,6 @@ public class NattableaxisconfigurationEditor
 	 * This shows how a tree view with columns works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewerWithColumns;

@@ -266,7 +253,6 @@ public class NattableaxisconfigurationEditor
 	 * This keeps track of the active viewer pane, in the book.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ViewerPane currentViewerPane;

@@ -275,7 +261,6 @@ public class NattableaxisconfigurationEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Viewer currentViewer;

@@ -284,7 +269,6 @@ public class NattableaxisconfigurationEditor
 	 * This listens to which ever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionChangedListener selectionChangedListener;

@@ -293,7 +277,6 @@ public class NattableaxisconfigurationEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

@@ -302,7 +285,6 @@ public class NattableaxisconfigurationEditor
 	 * This keeps track of the selection of the editor as a whole.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelection editorSelection = StructuredSelection.EMPTY;

@@ -312,7 +294,6 @@ public class NattableaxisconfigurationEditor
 	 * in Eclipse's Problems View.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

@@ -321,52 +302,46 @@ public class NattableaxisconfigurationEditor
 	 * This listens for when the outline becomes active

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IPartListener partListener =

 			new IPartListener() {

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(NattableaxisconfigurationEditor.this);

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(NattableaxisconfigurationEditor.this);

 

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(NattableaxisconfigurationEditor.this);

-							handleActivate();

-						}

+						setCurrentViewer(contentOutlineViewer);

 					}

-					else if (p == NattableaxisconfigurationEditor.this) {

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(NattableaxisconfigurationEditor.this);

 						handleActivate();

 					}

 				}

-

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

+				else if (p == NattableaxisconfigurationEditor.this) {

+					handleActivate();

 				}

-

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

 

 	/**

 	 * Resources that have been removed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> removedResources = new ArrayList<Resource>();

@@ -375,7 +350,6 @@ public class NattableaxisconfigurationEditor
 	 * Resources that have been changed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> changedResources = new ArrayList<Resource>();

@@ -384,7 +358,6 @@ public class NattableaxisconfigurationEditor
 	 * Resources that have been saved.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> savedResources = new ArrayList<Resource>();

@@ -393,7 +366,6 @@ public class NattableaxisconfigurationEditor
 	 * Map to store the diagnostic associated with a resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

@@ -402,7 +374,6 @@ public class NattableaxisconfigurationEditor
 	 * Controls whether the problem indication should be updated.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean updateProblemIndication = true;

@@ -411,19 +382,18 @@ public class NattableaxisconfigurationEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EContentAdapter problemIndicationAdapter =

 			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

 						case Resource.RESOURCE__IS_LOADED:

 						case Resource.RESOURCE__ERRORS:

 						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

+							Resource resource = (Resource)notification.getNotifier();

 							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

 							if (diagnostic.getSeverity() != Diagnostic.OK) {

 								resourceToDiagnosticMap.put(resource, diagnostic);

@@ -434,136 +404,134 @@ public class NattableaxisconfigurationEditor
 

 							if (updateProblemIndication) {

 								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											public void run() {

-												updateProblemIndication();

-											}

-										});

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

 							}

 							break;

 						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

 					}

 				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

+				else {

+					super.notifyChanged(notification);

 				}

+			}

 

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

 				}

-			};

+			}

+		};

 

 	/**

 	 * This listens for workspace changes.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IResourceChangeListener resourceChangeListener =

 			new IResourceChangeListener() {

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

 										}

 									}

-									return false;

 								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

+								return false;

 							}

 

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

+							return true;

 						}

 

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(NattableaxisconfigurationEditor.this, false);

-											}

-										}

-									});

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

 						}

 

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == NattableaxisconfigurationEditor.this) {

-												handleActivate();

-											}

-										}

-									});

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

 						}

 					}

-					catch (CoreException exception) {

-						NattableEditorPlugin.INSTANCE.log(exception);

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(NattableaxisconfigurationEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == NattableaxisconfigurationEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

 					}

 				}

-			};

+				catch (CoreException exception) {

+					NattableEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

 

 	/**

 	 * Handles activation of the editor or it's associated views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleActivate() {

 		// Recompute the read only state.

 		//

 		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

+		  editingDomain.getResourceToReadOnlyMap().clear();

 

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

 		}

 

 		if (!removedResources.isEmpty()) {

@@ -588,7 +556,6 @@ public class NattableaxisconfigurationEditor
 	 * Handles what to do with changed resources on activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleChangedResources() {

@@ -604,7 +571,8 @@ public class NattableaxisconfigurationEditor
 					resource.unload();

 					try {

 						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

+					}

+					catch (IOException exception) {

 						if (!resourceToDiagnosticMap.containsKey(resource)) {

 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

@@ -625,17 +593,17 @@ public class NattableaxisconfigurationEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void updateProblemIndication() {

 		if (updateProblemIndication) {

 			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

 			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

 				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

 					diagnostic.add(childDiagnostic);

@@ -644,7 +612,7 @@ public class NattableaxisconfigurationEditor
 

 			int lastEditorPage = getPageCount() - 1;

 			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					setActivePage(lastEditorPage);

 				}

@@ -658,7 +626,8 @@ public class NattableaxisconfigurationEditor
 					setPageText(lastEditorPage, problemEditorPart.getPartName());

 					setActivePage(lastEditorPage);

 					showTabs();

-				} catch (PartInitException exception) {

+				}

+				catch (PartInitException exception) {

 					NattableEditorPlugin.INSTANCE.log(exception);

 				}

 			}

@@ -668,7 +637,8 @@ public class NattableaxisconfigurationEditor
 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					try {

 						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

+					}

+					catch (CoreException exception) {

 						NattableEditorPlugin.INSTANCE.log(exception);

 					}

 				}

@@ -680,21 +650,20 @@ public class NattableaxisconfigurationEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

+		return

+			MessageDialog.openQuestion

 				(getSite().getShell(),

-						getString("_UI_FileConflict_label"), //$NON-NLS-1$

-						getString("_WARN_FileConflict")); //$NON-NLS-1$

+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

+				 getString("_WARN_FileConflict")); //$NON-NLS-1$

 	}

 

 	/**

 	 * This creates a model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableaxisconfigurationEditor() {

@@ -706,7 +675,6 @@ public class NattableaxisconfigurationEditor
 	 * This sets up the editing domain for the model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void initializeEditingDomain() {

@@ -735,32 +703,32 @@ public class NattableaxisconfigurationEditor
 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

 		//

 		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

 

 		// Create the editing domain with a special command stack.

 		//

@@ -771,7 +739,6 @@ public class NattableaxisconfigurationEditor
 	 * This is here for the listener to be able to call it.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -783,7 +750,6 @@ public class NattableaxisconfigurationEditor
 	 * This sets the selection into whichever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setSelectionToViewer(Collection<?> collection) {

@@ -792,25 +758,25 @@ public class NattableaxisconfigurationEditor
 		//

 		if (theSelection != null && !theSelection.isEmpty()) {

 			Runnable runnable =

-					new Runnable() {

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

 						}

-					};

+					}

+				};

 			getSite().getShell().getDisplay().asyncExec(runnable);

 		}

 	}

 

 	/**

 	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -821,14 +787,12 @@ public class NattableaxisconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

@@ -838,11 +802,10 @@ public class NattableaxisconfigurationEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getElements(Object object) {

+		public Object [] getElements(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -850,11 +813,10 @@ public class NattableaxisconfigurationEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getChildren(Object object) {

+		public Object [] getChildren(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -862,7 +824,6 @@ public class NattableaxisconfigurationEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -874,7 +835,6 @@ public class NattableaxisconfigurationEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -886,7 +846,6 @@ public class NattableaxisconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewerPane(ViewerPane viewerPane) {

@@ -904,7 +863,6 @@ public class NattableaxisconfigurationEditor
 	 * is the current one.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewer(Viewer viewer) {

@@ -915,13 +873,13 @@ public class NattableaxisconfigurationEditor
 				// Create the listener on demand.

 				//

 				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

 			}

 

 			// Stop listening to the old one.

@@ -950,7 +908,6 @@ public class NattableaxisconfigurationEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -962,7 +919,6 @@ public class NattableaxisconfigurationEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void createContextMenuFor(StructuredViewer viewer) {

@@ -970,7 +926,7 @@ public class NattableaxisconfigurationEditor
 		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

 		contextMenu.setRemoveAllWhenShown(true);

 		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

 		viewer.getControl().setMenu(menu);

 		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

 

@@ -984,25 +940,25 @@ public class NattableaxisconfigurationEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

 		Exception exception = null;

 		Resource resource = null;

 		try {

 			// Load the resource through the editing domain.

 			//

 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

+		}

+		catch (Exception e) {

 			exception = e;

 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

 		}

 

 		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

 		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

 		}

 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

 	}

@@ -1012,25 +968,29 @@ public class NattableaxisconfigurationEditor
 	 * and the specified exception (if any).

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+		boolean hasErrors = !resource.getErrors().isEmpty();

+		if (hasErrors || !resource.getWarnings().isEmpty()) {

 			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-							new Object[] { exception == null ? (Object) resource : exception });

+				new BasicDiagnostic

+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object [] { exception == null ? (Object)resource : exception });

 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

 			return basicDiagnostic;

 		}

 		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					new Object[] { exception });

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object[] { exception });

 		}

 		else {

 			return Diagnostic.OK_INSTANCE;

@@ -1041,7 +1001,6 @@ public class NattableaxisconfigurationEditor
 	 * This is the method used by the framework to install your own controls.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1057,23 +1016,22 @@ public class NattableaxisconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

 				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 

 				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1092,23 +1050,22 @@ public class NattableaxisconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				parentViewer = (TreeViewer) viewerPane.getViewer();

+				parentViewer = (TreeViewer)viewerPane.getViewer();

 				parentViewer.setAutoExpandLevel(30);

 				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

 				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1122,20 +1079,19 @@ public class NattableaxisconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

+				listViewer = (ListViewer)viewerPane.getViewer();

 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1148,20 +1104,19 @@ public class NattableaxisconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

+				treeViewer = (TreeViewer)viewerPane.getViewer();

 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1176,20 +1131,19 @@ public class NattableaxisconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

+				tableViewer = (TableViewer)viewerPane.getViewer();

 

 				Table table = tableViewer.getTable();

 				TableLayout layout = new TableLayout();

@@ -1207,7 +1161,7 @@ public class NattableaxisconfigurationEditor
 				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

 				selfColumn.setResizable(true);

 

-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1220,21 +1174,20 @@ public class NattableaxisconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

 

 				Tree tree = treeViewerWithColumns.getTree();

 				tree.setLayoutData(new FillLayout());

@@ -1251,7 +1204,7 @@ public class NattableaxisconfigurationEditor
 				selfColumn.setResizable(true);

 				selfColumn.setWidth(200);

 

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1261,36 +1214,35 @@ public class NattableaxisconfigurationEditor
 			}

 

 			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						public void run() {

-							setActivePage(0);

-						}

-					});

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

 		}

 

 		// Ensures that this editor will only display the page's tab

 		// area if there are more than one page

 		//

 		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

 					}

-				});

+				}

+			 });

 

 		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					public void run() {

-						updateProblemIndication();

-					}

-				});

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

 	}

 

 	/**

@@ -1298,14 +1250,13 @@ public class NattableaxisconfigurationEditor
 	 * this hides the single tab at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void hideTabs() {

 		if (getPageCount() <= 1) {

 			setPageText(0, ""); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

+				((CTabFolder)getContainer()).setTabHeight(1);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y + 6);

 			}

@@ -1317,14 +1268,13 @@ public class NattableaxisconfigurationEditor
 	 * this shows the tabs at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void showTabs() {

 		if (getPageCount() > 1) {

 			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y - 6);

 			}

@@ -1335,7 +1285,6 @@ public class NattableaxisconfigurationEditor
 	 * This is used to track the active viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1351,7 +1300,6 @@ public class NattableaxisconfigurationEditor
 	 * This is how the framework determines which interfaces we implement.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("rawtypes")

@@ -1375,7 +1323,6 @@ public class NattableaxisconfigurationEditor
 	 * This accesses a cached version of the content outliner.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IContentOutlinePage getContentOutlinePage() {

@@ -1400,9 +1347,9 @@ public class NattableaxisconfigurationEditor
 					createContextMenuFor(contentOutlineViewer);

 

 					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 					}

 				}

 

@@ -1424,13 +1371,13 @@ public class NattableaxisconfigurationEditor
 			// Listen to selection so that we can handle it is a special way.

 			//

 			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

 		}

 

 		return contentOutlinePage;

@@ -1440,24 +1387,23 @@ public class NattableaxisconfigurationEditor
 	 * This accesses a cached version of the property sheet.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

 		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						NattableaxisconfigurationEditor.this.setSelectionToViewer(selection);

-						NattableaxisconfigurationEditor.this.setFocus();

-					}

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					NattableaxisconfigurationEditor.this.setSelectionToViewer(selection);

+					NattableaxisconfigurationEditor.this.setFocus();

+				}

 

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

 		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

 		propertySheetPages.add(propertySheetPage);

 

@@ -1468,12 +1414,11 @@ public class NattableaxisconfigurationEditor
 	 * This deals with how we want selection in the outliner to affect the other views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void handleContentOutlineSelection(ISelection selection) {

 		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

 			if (selectedElements.hasNext()) {

 				// Get the first selected element.

 				//

@@ -1508,19 +1453,17 @@ public class NattableaxisconfigurationEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

 	}

 

 	/**

 	 * This is for implementing {@link IEditorPart} and simply saves the model file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1534,31 +1477,31 @@ public class NattableaxisconfigurationEditor
 		// Do the work within an operation because this is a long running activity that modifies the workbench.

 		//

 		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

 					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

 								}

-								first = false;

 							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

 						}

 					}

-				};

+				}

+			};

 

 		updateProblemIndication = false;

 		try {

@@ -1568,9 +1511,10 @@ public class NattableaxisconfigurationEditor
 

 			// Refresh the necessary state.

 			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

 			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			// Something went wrong that shouldn't.

 			//

 			NattableEditorPlugin.INSTANCE.log(exception);

@@ -1584,7 +1528,6 @@ public class NattableaxisconfigurationEditor
 	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean isPersisted(Resource resource) {

@@ -1595,7 +1538,8 @@ public class NattableaxisconfigurationEditor
 				result = true;

 				stream.close();

 			}

-		} catch (IOException e) {

+		}

+		catch (IOException e) {

 			// Ignore

 		}

 		return result;

@@ -1605,7 +1549,6 @@ public class NattableaxisconfigurationEditor
 	 * This always returns true because it is not currently supported.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1617,7 +1560,6 @@ public class NattableaxisconfigurationEditor
 	 * This also changes the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1636,7 +1578,6 @@ public class NattableaxisconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void doSaveAs(URI uri, IEditorInput editorInput) {

@@ -1644,16 +1585,15 @@ public class NattableaxisconfigurationEditor
 		setInputWithNotify(editorInput);

 		setPartName(editorInput.getName());

 		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

 		doSave(progressMonitor);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1668,7 +1608,6 @@ public class NattableaxisconfigurationEditor
 	 * This is called during startup.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1684,7 +1623,6 @@ public class NattableaxisconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1701,7 +1639,6 @@ public class NattableaxisconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1713,7 +1650,6 @@ public class NattableaxisconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1725,7 +1661,6 @@ public class NattableaxisconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1738,7 +1673,6 @@ public class NattableaxisconfigurationEditor
 	 * Calling this result will notify the listeners.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1754,30 +1688,29 @@ public class NattableaxisconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setStatusLineManager(ISelection selection) {

 		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

 

 		if (statusLineManager != null) {

 			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

 				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-					break;

-				}

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

+						break;

+					}

 				}

 			}

 			else {

@@ -1790,7 +1723,6 @@ public class NattableaxisconfigurationEditor
 	 * This looks up a string in the plugin's plugin.properties file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key) {

@@ -1801,39 +1733,35 @@ public class NattableaxisconfigurationEditor
 	 * This looks up a string in plugin.properties, making a substitution.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

 	}

 

 	/**

 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IActionBars getActionBars() {

@@ -1843,7 +1771,6 @@ public class NattableaxisconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AdapterFactory getAdapterFactory() {

@@ -1853,7 +1780,6 @@ public class NattableaxisconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1885,7 +1811,6 @@ public class NattableaxisconfigurationEditor
 	 * Returns whether the outline view should be presented to the user.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean showOutlineView() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
index d9c52472899..5db89bb0640 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
@@ -75,7 +75,6 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableaxisconfigurationModelWizard extends Wizard implements INewWizard {

@@ -83,7 +82,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * The supported extensions for created files.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final List<String> FILE_EXTENSIONS =

@@ -93,7 +91,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * A formatted list of supported file extensions, suitable for display.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final String FORMATTED_FILE_EXTENSIONS =

@@ -103,7 +100,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This caches an instance of the model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisconfigurationPackage nattableaxisconfigurationPackage = NattableaxisconfigurationPackage.eINSTANCE;

@@ -112,7 +108,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This caches an instance of the model factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisconfigurationFactory nattableaxisconfigurationFactory = nattableaxisconfigurationPackage.getNattableaxisconfigurationFactory();

@@ -121,7 +116,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This is the file creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisconfigurationModelWizardNewFileCreationPage newFileCreationPage;

@@ -130,7 +124,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This is the initial object creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;

@@ -139,7 +132,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Remember the selection during initialization for populating the default container.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStructuredSelection selection;

@@ -148,7 +140,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Remember the workbench during initialization.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IWorkbench workbench;

@@ -157,7 +148,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Caches the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<String> initialObjectNames;

@@ -166,7 +156,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This just records the information.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -181,7 +170,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Returns the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<String> getInitialObjectNames() {

@@ -189,7 +177,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 			initialObjectNames = new ArrayList<String>();

 			for (EClassifier eClassifier : nattableaxisconfigurationPackage.getEClassifiers()) {

 				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

+					EClass eClass = (EClass)eClassifier;

 					if (!eClass.isAbstract()) {

 						initialObjectNames.add(eClass.getName());

 					}

@@ -204,11 +192,10 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Create a new model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObject createInitialModel() {

-		EClass eClass = (EClass) nattableaxisconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EClass eClass = (EClass)nattableaxisconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

 		EObject rootObject = nattableaxisconfigurationFactory.create(eClass);

 		return rootObject;

 	}

@@ -217,7 +204,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Do the work after everything is specified.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -230,43 +216,43 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 			// Do the work within an operation.

 			//

 			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								NattableEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

 							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							NattableEditorPlugin.INSTANCE.log(exception);

 						}

-					};

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

 

 			getContainer().run(false, false, operation);

 

@@ -278,26 +264,28 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 			if (activePart instanceof ISetSelectionTarget) {

 				final ISelection targetSelection = new StructuredSelection(modelFile);

 				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

 			}

 

 			// Open an editor on the new file.

 			//

 			try {

 				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

 				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

 				return false;

 			}

 

 			return true;

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			NattableEditorPlugin.INSTANCE.log(exception);

 			return false;

 		}

@@ -307,7 +295,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This is the one page of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableaxisconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

@@ -315,7 +302,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableaxisconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

@@ -326,7 +312,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		 * The framework calls this to see if the file is correct.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -335,7 +320,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 				String extension = new Path(getFileName()).getFileExtension();

 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

 					return false;

 				}

 				return true;

@@ -346,7 +331,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public IFile getModelFile() {

@@ -358,14 +342,12 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * This is the page where the type of object to create is selected.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableaxisconfigurationModelWizardInitialObjectCreationPage extends WizardPage {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo initialObjectField;

@@ -380,7 +362,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo encodingField;

@@ -389,7 +370,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableaxisconfigurationModelWizardInitialObjectCreationPage(String pageId) {

@@ -399,13 +379,11 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

 		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

+			Composite composite = new Composite(parent, SWT.NONE); {

 				GridLayout layout = new GridLayout();

 				layout.numColumns = 1;

 				layout.verticalSpacing = 12;

@@ -474,20 +452,18 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected ModifyListener validator =

 				new ModifyListener() {

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected boolean validatePage() {

@@ -497,7 +473,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -518,7 +493,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getInitialObjectName() {

@@ -535,7 +509,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getEncoding() {

@@ -546,13 +519,13 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		 * Returns the label for the specified type name.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected String getLabel(String typeName) {

 			try {

 				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (MissingResourceException mre) {

+			}

+			catch(MissingResourceException mre) {

 				NattableEditorPlugin.INSTANCE.log(mre);

 			}

 			return typeName;

@@ -561,13 +534,12 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Collection<String> getEncodings() {

 			if (encodings == null) {

 				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$

+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

 				{

 					encodings.add(stringTokenizer.nextToken());

 				}

@@ -580,7 +552,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * The framework calls this to create the contents of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -602,7 +573,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 			if (selectedElement instanceof IResource) {

 				// Get the resource parent, if its a file.

 				//

-				IResource selectedResource = (IResource) selectedElement;

+				IResource selectedResource = (IResource)selectedElement;

 				if (selectedResource.getType() == IResource.FILE) {

 					selectedResource = selectedResource.getParent();

 				}

@@ -619,7 +590,7 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisconfigurationEditorFilenameDefaultBase"); //$NON-NLS-1$

 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

 					}

 					newFileCreationPage.setFileName(modelFilename);

@@ -636,7 +607,6 @@ public class NattableaxisconfigurationModelWizard extends Wizard implements INew
 	 * Get the file from the page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IFile getModelFile() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
index e42fe9dd204..3abc882f698 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
@@ -49,7 +49,6 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattableaxisprovider model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableaxisproviderActionBarContributor

@@ -59,7 +58,6 @@ public class NattableaxisproviderActionBarContributor
 	 * This keeps track of the active editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IEditorPart activeEditorPart;

@@ -68,7 +66,6 @@ public class NattableaxisproviderActionBarContributor
 	 * This keeps track of the current selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionProvider selectionProvider;

@@ -77,56 +74,53 @@ public class NattableaxisproviderActionBarContributor
 	 * 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);

-					}

+		{

+			@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 boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

 

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

+			@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;

@@ -135,7 +129,6 @@ public class NattableaxisproviderActionBarContributor
 	 * 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;

@@ -145,7 +138,6 @@ public class NattableaxisproviderActionBarContributor
 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createSiblingActions;

@@ -154,7 +146,6 @@ public class NattableaxisproviderActionBarContributor
 	 * 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;

@@ -163,7 +154,6 @@ public class NattableaxisproviderActionBarContributor
 	 * This creates an instance of the contributor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableaxisproviderActionBarContributor() {

@@ -177,7 +167,6 @@ public class NattableaxisproviderActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -191,7 +180,6 @@ public class NattableaxisproviderActionBarContributor
 	 * as well as the sub-menus for object creation items.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -218,11 +206,11 @@ public class NattableaxisproviderActionBarContributor
 		// Force an update because Eclipse hides empty menus now.

 		//

 		submenuManager.addMenuListener

-				(new IMenuListener() {

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

 

 		addGlobalActions(submenuManager);

 	}

@@ -231,7 +219,6 @@ public class NattableaxisproviderActionBarContributor
 	 * 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

@@ -265,7 +252,6 @@ public class NattableaxisproviderActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -285,10 +271,10 @@ public class NattableaxisproviderActionBarContributor
 		Collection<?> newSiblingDescriptors = null;

 

 		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

 

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

 

 			newChildDescriptors = domain.getNewChildDescriptors(object, null);

 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

@@ -314,7 +300,6 @@ public class NattableaxisproviderActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

@@ -332,7 +317,6 @@ public class NattableaxisproviderActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

@@ -352,7 +336,6 @@ public class NattableaxisproviderActionBarContributor
 	 * 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) {

@@ -373,7 +356,6 @@ public class NattableaxisproviderActionBarContributor
 	 * 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) {

@@ -384,13 +366,13 @@ public class NattableaxisproviderActionBarContributor
 				//

 				IContributionItem contributionItem = items[i];

 				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

 				}

 

 				// Delete the ActionContributionItems with matching action.

 				//

 				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

 					if (actions.contains(action)) {

 						manager.remove(contributionItem);

 					}

@@ -403,7 +385,6 @@ public class NattableaxisproviderActionBarContributor
 	 * This populates the pop-up menu before it appears.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -424,7 +405,6 @@ public class NattableaxisproviderActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -432,7 +412,7 @@ public class NattableaxisproviderActionBarContributor
 		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());

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

 		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

 

 		super.addGlobalActions(menuManager);

@@ -442,7 +422,6 @@ public class NattableaxisproviderActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
index b9686e4c796..78bf7bfb7c7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
@@ -145,7 +145,6 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattableaxisprovider model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableaxisproviderEditor

@@ -155,7 +154,6 @@ public class NattableaxisproviderEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AdapterFactoryEditingDomain editingDomain;

@@ -164,7 +162,6 @@ public class NattableaxisproviderEditor
 	 * This is the one adapter factory used for providing views of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory adapterFactory;

@@ -173,7 +170,6 @@ public class NattableaxisproviderEditor
 	 * This is the content outline page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IContentOutlinePage contentOutlinePage;

@@ -182,7 +178,6 @@ public class NattableaxisproviderEditor
 	 * This is a kludge...

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStatusLineManager contentOutlineStatusLineManager;

@@ -191,7 +186,6 @@ public class NattableaxisproviderEditor
 	 * This is the content outline page's viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer contentOutlineViewer;

@@ -200,7 +194,6 @@ public class NattableaxisproviderEditor
 	 * This is the property sheet page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

@@ -210,7 +203,6 @@ public class NattableaxisproviderEditor
 	 * The parent relation must be correctly defined for this to work.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer selectionViewer;

@@ -219,7 +211,6 @@ public class NattableaxisproviderEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer parentViewer;

@@ -228,7 +219,6 @@ public class NattableaxisproviderEditor
 	 * This shows how a tree view works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewer;

@@ -238,7 +228,6 @@ public class NattableaxisproviderEditor
 	 * A list viewer doesn't support icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ListViewer listViewer;

@@ -248,7 +237,6 @@ public class NattableaxisproviderEditor
 	 * A table can be used as a list with icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableViewer tableViewer;

@@ -257,7 +245,6 @@ public class NattableaxisproviderEditor
 	 * This shows how a tree view with columns works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewerWithColumns;

@@ -266,7 +253,6 @@ public class NattableaxisproviderEditor
 	 * This keeps track of the active viewer pane, in the book.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ViewerPane currentViewerPane;

@@ -275,7 +261,6 @@ public class NattableaxisproviderEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Viewer currentViewer;

@@ -284,7 +269,6 @@ public class NattableaxisproviderEditor
 	 * This listens to which ever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionChangedListener selectionChangedListener;

@@ -293,7 +277,6 @@ public class NattableaxisproviderEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

@@ -302,7 +285,6 @@ public class NattableaxisproviderEditor
 	 * This keeps track of the selection of the editor as a whole.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelection editorSelection = StructuredSelection.EMPTY;

@@ -312,7 +294,6 @@ public class NattableaxisproviderEditor
 	 * in Eclipse's Problems View.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

@@ -321,52 +302,46 @@ public class NattableaxisproviderEditor
 	 * This listens for when the outline becomes active

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IPartListener partListener =

 			new IPartListener() {

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(NattableaxisproviderEditor.this);

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(NattableaxisproviderEditor.this);

 

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(NattableaxisproviderEditor.this);

-							handleActivate();

-						}

+						setCurrentViewer(contentOutlineViewer);

 					}

-					else if (p == NattableaxisproviderEditor.this) {

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(NattableaxisproviderEditor.this);

 						handleActivate();

 					}

 				}

-

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

+				else if (p == NattableaxisproviderEditor.this) {

+					handleActivate();

 				}

-

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

 

 	/**

 	 * Resources that have been removed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> removedResources = new ArrayList<Resource>();

@@ -375,7 +350,6 @@ public class NattableaxisproviderEditor
 	 * Resources that have been changed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> changedResources = new ArrayList<Resource>();

@@ -384,7 +358,6 @@ public class NattableaxisproviderEditor
 	 * Resources that have been saved.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> savedResources = new ArrayList<Resource>();

@@ -393,7 +366,6 @@ public class NattableaxisproviderEditor
 	 * Map to store the diagnostic associated with a resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

@@ -402,7 +374,6 @@ public class NattableaxisproviderEditor
 	 * Controls whether the problem indication should be updated.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean updateProblemIndication = true;

@@ -411,19 +382,18 @@ public class NattableaxisproviderEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EContentAdapter problemIndicationAdapter =

 			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

 						case Resource.RESOURCE__IS_LOADED:

 						case Resource.RESOURCE__ERRORS:

 						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

+							Resource resource = (Resource)notification.getNotifier();

 							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

 							if (diagnostic.getSeverity() != Diagnostic.OK) {

 								resourceToDiagnosticMap.put(resource, diagnostic);

@@ -434,136 +404,134 @@ public class NattableaxisproviderEditor
 

 							if (updateProblemIndication) {

 								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											public void run() {

-												updateProblemIndication();

-											}

-										});

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

 							}

 							break;

 						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

 					}

 				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

+				else {

+					super.notifyChanged(notification);

 				}

+			}

 

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

 				}

-			};

+			}

+		};

 

 	/**

 	 * This listens for workspace changes.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IResourceChangeListener resourceChangeListener =

 			new IResourceChangeListener() {

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

 										}

 									}

-									return false;

 								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

+								return false;

 							}

 

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

+							return true;

 						}

 

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(NattableaxisproviderEditor.this, false);

-											}

-										}

-									});

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

 						}

 

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == NattableaxisproviderEditor.this) {

-												handleActivate();

-											}

-										}

-									});

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

 						}

 					}

-					catch (CoreException exception) {

-						NattableEditorPlugin.INSTANCE.log(exception);

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(NattableaxisproviderEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == NattableaxisproviderEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

 					}

 				}

-			};

+				catch (CoreException exception) {

+					NattableEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

 

 	/**

 	 * Handles activation of the editor or it's associated views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleActivate() {

 		// Recompute the read only state.

 		//

 		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

+		  editingDomain.getResourceToReadOnlyMap().clear();

 

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

 		}

 

 		if (!removedResources.isEmpty()) {

@@ -588,7 +556,6 @@ public class NattableaxisproviderEditor
 	 * Handles what to do with changed resources on activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleChangedResources() {

@@ -604,7 +571,8 @@ public class NattableaxisproviderEditor
 					resource.unload();

 					try {

 						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

+					}

+					catch (IOException exception) {

 						if (!resourceToDiagnosticMap.containsKey(resource)) {

 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

@@ -625,17 +593,17 @@ public class NattableaxisproviderEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void updateProblemIndication() {

 		if (updateProblemIndication) {

 			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

 			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

 				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

 					diagnostic.add(childDiagnostic);

@@ -644,7 +612,7 @@ public class NattableaxisproviderEditor
 

 			int lastEditorPage = getPageCount() - 1;

 			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					setActivePage(lastEditorPage);

 				}

@@ -658,7 +626,8 @@ public class NattableaxisproviderEditor
 					setPageText(lastEditorPage, problemEditorPart.getPartName());

 					setActivePage(lastEditorPage);

 					showTabs();

-				} catch (PartInitException exception) {

+				}

+				catch (PartInitException exception) {

 					NattableEditorPlugin.INSTANCE.log(exception);

 				}

 			}

@@ -668,7 +637,8 @@ public class NattableaxisproviderEditor
 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					try {

 						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

+					}

+					catch (CoreException exception) {

 						NattableEditorPlugin.INSTANCE.log(exception);

 					}

 				}

@@ -680,21 +650,20 @@ public class NattableaxisproviderEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

+		return

+			MessageDialog.openQuestion

 				(getSite().getShell(),

-						getString("_UI_FileConflict_label"), //$NON-NLS-1$

-						getString("_WARN_FileConflict")); //$NON-NLS-1$

+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

+				 getString("_WARN_FileConflict")); //$NON-NLS-1$

 	}

 

 	/**

 	 * This creates a model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableaxisproviderEditor() {

@@ -706,7 +675,6 @@ public class NattableaxisproviderEditor
 	 * This sets up the editing domain for the model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void initializeEditingDomain() {

@@ -735,32 +703,32 @@ public class NattableaxisproviderEditor
 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

 		//

 		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

 

 		// Create the editing domain with a special command stack.

 		//

@@ -771,7 +739,6 @@ public class NattableaxisproviderEditor
 	 * This is here for the listener to be able to call it.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -783,7 +750,6 @@ public class NattableaxisproviderEditor
 	 * This sets the selection into whichever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setSelectionToViewer(Collection<?> collection) {

@@ -792,25 +758,25 @@ public class NattableaxisproviderEditor
 		//

 		if (theSelection != null && !theSelection.isEmpty()) {

 			Runnable runnable =

-					new Runnable() {

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

 						}

-					};

+					}

+				};

 			getSite().getShell().getDisplay().asyncExec(runnable);

 		}

 	}

 

 	/**

 	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -821,14 +787,12 @@ public class NattableaxisproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

@@ -838,11 +802,10 @@ public class NattableaxisproviderEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getElements(Object object) {

+		public Object [] getElements(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -850,11 +813,10 @@ public class NattableaxisproviderEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getChildren(Object object) {

+		public Object [] getChildren(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -862,7 +824,6 @@ public class NattableaxisproviderEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -874,7 +835,6 @@ public class NattableaxisproviderEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -886,7 +846,6 @@ public class NattableaxisproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewerPane(ViewerPane viewerPane) {

@@ -904,7 +863,6 @@ public class NattableaxisproviderEditor
 	 * is the current one.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewer(Viewer viewer) {

@@ -915,13 +873,13 @@ public class NattableaxisproviderEditor
 				// Create the listener on demand.

 				//

 				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

 			}

 

 			// Stop listening to the old one.

@@ -950,7 +908,6 @@ public class NattableaxisproviderEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -962,7 +919,6 @@ public class NattableaxisproviderEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void createContextMenuFor(StructuredViewer viewer) {

@@ -970,7 +926,7 @@ public class NattableaxisproviderEditor
 		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

 		contextMenu.setRemoveAllWhenShown(true);

 		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

 		viewer.getControl().setMenu(menu);

 		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

 

@@ -984,25 +940,25 @@ public class NattableaxisproviderEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

 		Exception exception = null;

 		Resource resource = null;

 		try {

 			// Load the resource through the editing domain.

 			//

 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

+		}

+		catch (Exception e) {

 			exception = e;

 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

 		}

 

 		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

 		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

 		}

 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

 	}

@@ -1012,25 +968,29 @@ public class NattableaxisproviderEditor
 	 * and the specified exception (if any).

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+		boolean hasErrors = !resource.getErrors().isEmpty();

+		if (hasErrors || !resource.getWarnings().isEmpty()) {

 			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-							new Object[] { exception == null ? (Object) resource : exception });

+				new BasicDiagnostic

+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object [] { exception == null ? (Object)resource : exception });

 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

 			return basicDiagnostic;

 		}

 		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					new Object[] { exception });

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object[] { exception });

 		}

 		else {

 			return Diagnostic.OK_INSTANCE;

@@ -1041,7 +1001,6 @@ public class NattableaxisproviderEditor
 	 * This is the method used by the framework to install your own controls.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1057,23 +1016,22 @@ public class NattableaxisproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

 				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 

 				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1092,23 +1050,22 @@ public class NattableaxisproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				parentViewer = (TreeViewer) viewerPane.getViewer();

+				parentViewer = (TreeViewer)viewerPane.getViewer();

 				parentViewer.setAutoExpandLevel(30);

 				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

 				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1122,20 +1079,19 @@ public class NattableaxisproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

+				listViewer = (ListViewer)viewerPane.getViewer();

 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1148,20 +1104,19 @@ public class NattableaxisproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

+				treeViewer = (TreeViewer)viewerPane.getViewer();

 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1176,20 +1131,19 @@ public class NattableaxisproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

+				tableViewer = (TableViewer)viewerPane.getViewer();

 

 				Table table = tableViewer.getTable();

 				TableLayout layout = new TableLayout();

@@ -1207,7 +1161,7 @@ public class NattableaxisproviderEditor
 				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

 				selfColumn.setResizable(true);

 

-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1220,21 +1174,20 @@ public class NattableaxisproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableaxisproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

 

 				Tree tree = treeViewerWithColumns.getTree();

 				tree.setLayoutData(new FillLayout());

@@ -1251,7 +1204,7 @@ public class NattableaxisproviderEditor
 				selfColumn.setResizable(true);

 				selfColumn.setWidth(200);

 

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1261,36 +1214,35 @@ public class NattableaxisproviderEditor
 			}

 

 			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						public void run() {

-							setActivePage(0);

-						}

-					});

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

 		}

 

 		// Ensures that this editor will only display the page's tab

 		// area if there are more than one page

 		//

 		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

 					}

-				});

+				}

+			 });

 

 		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					public void run() {

-						updateProblemIndication();

-					}

-				});

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

 	}

 

 	/**

@@ -1298,14 +1250,13 @@ public class NattableaxisproviderEditor
 	 * this hides the single tab at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void hideTabs() {

 		if (getPageCount() <= 1) {

 			setPageText(0, ""); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

+				((CTabFolder)getContainer()).setTabHeight(1);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y + 6);

 			}

@@ -1317,14 +1268,13 @@ public class NattableaxisproviderEditor
 	 * this shows the tabs at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void showTabs() {

 		if (getPageCount() > 1) {

 			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y - 6);

 			}

@@ -1335,7 +1285,6 @@ public class NattableaxisproviderEditor
 	 * This is used to track the active viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1351,7 +1300,6 @@ public class NattableaxisproviderEditor
 	 * This is how the framework determines which interfaces we implement.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("rawtypes")

@@ -1375,7 +1323,6 @@ public class NattableaxisproviderEditor
 	 * This accesses a cached version of the content outliner.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IContentOutlinePage getContentOutlinePage() {

@@ -1400,9 +1347,9 @@ public class NattableaxisproviderEditor
 					createContextMenuFor(contentOutlineViewer);

 

 					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 					}

 				}

 

@@ -1424,13 +1371,13 @@ public class NattableaxisproviderEditor
 			// Listen to selection so that we can handle it is a special way.

 			//

 			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

 		}

 

 		return contentOutlinePage;

@@ -1440,24 +1387,23 @@ public class NattableaxisproviderEditor
 	 * This accesses a cached version of the property sheet.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

 		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						NattableaxisproviderEditor.this.setSelectionToViewer(selection);

-						NattableaxisproviderEditor.this.setFocus();

-					}

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					NattableaxisproviderEditor.this.setSelectionToViewer(selection);

+					NattableaxisproviderEditor.this.setFocus();

+				}

 

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

 		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

 		propertySheetPages.add(propertySheetPage);

 

@@ -1468,12 +1414,11 @@ public class NattableaxisproviderEditor
 	 * This deals with how we want selection in the outliner to affect the other views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void handleContentOutlineSelection(ISelection selection) {

 		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

 			if (selectedElements.hasNext()) {

 				// Get the first selected element.

 				//

@@ -1508,19 +1453,17 @@ public class NattableaxisproviderEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

 	}

 

 	/**

 	 * This is for implementing {@link IEditorPart} and simply saves the model file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1534,31 +1477,31 @@ public class NattableaxisproviderEditor
 		// Do the work within an operation because this is a long running activity that modifies the workbench.

 		//

 		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

 					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

 								}

-								first = false;

 							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

 						}

 					}

-				};

+				}

+			};

 

 		updateProblemIndication = false;

 		try {

@@ -1568,9 +1511,10 @@ public class NattableaxisproviderEditor
 

 			// Refresh the necessary state.

 			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

 			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			// Something went wrong that shouldn't.

 			//

 			NattableEditorPlugin.INSTANCE.log(exception);

@@ -1584,7 +1528,6 @@ public class NattableaxisproviderEditor
 	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean isPersisted(Resource resource) {

@@ -1595,7 +1538,8 @@ public class NattableaxisproviderEditor
 				result = true;

 				stream.close();

 			}

-		} catch (IOException e) {

+		}

+		catch (IOException e) {

 			// Ignore

 		}

 		return result;

@@ -1605,7 +1549,6 @@ public class NattableaxisproviderEditor
 	 * This always returns true because it is not currently supported.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1617,7 +1560,6 @@ public class NattableaxisproviderEditor
 	 * This also changes the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1636,7 +1578,6 @@ public class NattableaxisproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void doSaveAs(URI uri, IEditorInput editorInput) {

@@ -1644,16 +1585,15 @@ public class NattableaxisproviderEditor
 		setInputWithNotify(editorInput);

 		setPartName(editorInput.getName());

 		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

 		doSave(progressMonitor);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1668,7 +1608,6 @@ public class NattableaxisproviderEditor
 	 * This is called during startup.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1684,7 +1623,6 @@ public class NattableaxisproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1701,7 +1639,6 @@ public class NattableaxisproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1713,7 +1650,6 @@ public class NattableaxisproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1725,7 +1661,6 @@ public class NattableaxisproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1738,7 +1673,6 @@ public class NattableaxisproviderEditor
 	 * Calling this result will notify the listeners.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1754,30 +1688,29 @@ public class NattableaxisproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setStatusLineManager(ISelection selection) {

 		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

 

 		if (statusLineManager != null) {

 			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

 				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-					break;

-				}

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

+						break;

+					}

 				}

 			}

 			else {

@@ -1790,7 +1723,6 @@ public class NattableaxisproviderEditor
 	 * This looks up a string in the plugin's plugin.properties file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key) {

@@ -1801,39 +1733,35 @@ public class NattableaxisproviderEditor
 	 * This looks up a string in plugin.properties, making a substitution.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

 	}

 

 	/**

 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IActionBars getActionBars() {

@@ -1843,7 +1771,6 @@ public class NattableaxisproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AdapterFactory getAdapterFactory() {

@@ -1853,7 +1780,6 @@ public class NattableaxisproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1885,7 +1811,6 @@ public class NattableaxisproviderEditor
 	 * Returns whether the outline view should be presented to the user.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean showOutlineView() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
index 83c8bfb67e0..9de19f118a0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
@@ -75,7 +75,6 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableaxisproviderModelWizard extends Wizard implements INewWizard {

@@ -83,7 +82,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * The supported extensions for created files.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final List<String> FILE_EXTENSIONS =

@@ -93,7 +91,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * A formatted list of supported file extensions, suitable for display.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final String FORMATTED_FILE_EXTENSIONS =

@@ -103,7 +100,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This caches an instance of the model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisproviderPackage nattableaxisproviderPackage = NattableaxisproviderPackage.eINSTANCE;

@@ -112,7 +108,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This caches an instance of the model factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisproviderFactory nattableaxisproviderFactory = nattableaxisproviderPackage.getNattableaxisproviderFactory();

@@ -121,7 +116,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This is the file creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisproviderModelWizardNewFileCreationPage newFileCreationPage;

@@ -130,7 +124,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This is the initial object creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableaxisproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;

@@ -139,7 +132,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Remember the selection during initialization for populating the default container.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStructuredSelection selection;

@@ -148,7 +140,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Remember the workbench during initialization.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IWorkbench workbench;

@@ -157,7 +148,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Caches the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<String> initialObjectNames;

@@ -166,7 +156,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This just records the information.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -181,7 +170,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Returns the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<String> getInitialObjectNames() {

@@ -189,7 +177,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 			initialObjectNames = new ArrayList<String>();

 			for (EClassifier eClassifier : nattableaxisproviderPackage.getEClassifiers()) {

 				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

+					EClass eClass = (EClass)eClassifier;

 					if (!eClass.isAbstract()) {

 						initialObjectNames.add(eClass.getName());

 					}

@@ -204,11 +192,10 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Create a new model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObject createInitialModel() {

-		EClass eClass = (EClass) nattableaxisproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EClass eClass = (EClass)nattableaxisproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

 		EObject rootObject = nattableaxisproviderFactory.create(eClass);

 		return rootObject;

 	}

@@ -217,7 +204,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Do the work after everything is specified.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -230,43 +216,43 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 			// Do the work within an operation.

 			//

 			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								NattableEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

 							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							NattableEditorPlugin.INSTANCE.log(exception);

 						}

-					};

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

 

 			getContainer().run(false, false, operation);

 

@@ -278,26 +264,28 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 			if (activePart instanceof ISetSelectionTarget) {

 				final ISelection targetSelection = new StructuredSelection(modelFile);

 				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

 			}

 

 			// Open an editor on the new file.

 			//

 			try {

 				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

 				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

 				return false;

 			}

 

 			return true;

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			NattableEditorPlugin.INSTANCE.log(exception);

 			return false;

 		}

@@ -307,7 +295,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This is the one page of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableaxisproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

@@ -315,7 +302,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableaxisproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

@@ -326,7 +312,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		 * The framework calls this to see if the file is correct.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -335,7 +320,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 				String extension = new Path(getFileName()).getFileExtension();

 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

 					return false;

 				}

 				return true;

@@ -346,7 +331,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public IFile getModelFile() {

@@ -358,14 +342,12 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * This is the page where the type of object to create is selected.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableaxisproviderModelWizardInitialObjectCreationPage extends WizardPage {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo initialObjectField;

@@ -380,7 +362,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo encodingField;

@@ -389,7 +370,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableaxisproviderModelWizardInitialObjectCreationPage(String pageId) {

@@ -399,13 +379,11 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

 		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

+			Composite composite = new Composite(parent, SWT.NONE); {

 				GridLayout layout = new GridLayout();

 				layout.numColumns = 1;

 				layout.verticalSpacing = 12;

@@ -474,20 +452,18 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected ModifyListener validator =

 				new ModifyListener() {

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected boolean validatePage() {

@@ -497,7 +473,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -518,7 +493,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getInitialObjectName() {

@@ -535,7 +509,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getEncoding() {

@@ -546,13 +519,13 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		 * Returns the label for the specified type name.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected String getLabel(String typeName) {

 			try {

 				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (MissingResourceException mre) {

+			}

+			catch(MissingResourceException mre) {

 				NattableEditorPlugin.INSTANCE.log(mre);

 			}

 			return typeName;

@@ -561,13 +534,12 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Collection<String> getEncodings() {

 			if (encodings == null) {

 				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$

+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

 				{

 					encodings.add(stringTokenizer.nextToken());

 				}

@@ -580,7 +552,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * The framework calls this to create the contents of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -602,7 +573,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 			if (selectedElement instanceof IResource) {

 				// Get the resource parent, if its a file.

 				//

-				IResource selectedResource = (IResource) selectedElement;

+				IResource selectedResource = (IResource)selectedElement;

 				if (selectedResource.getType() == IResource.FILE) {

 					selectedResource = selectedResource.getParent();

 				}

@@ -619,7 +590,7 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableaxisproviderEditorFilenameDefaultBase"); //$NON-NLS-1$

 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

 					}

 					newFileCreationPage.setFileName(modelFilename);

@@ -636,7 +607,6 @@ public class NattableaxisproviderModelWizard extends Wizard implements INewWizar
 	 * Get the file from the page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IFile getModelFile() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
index 79962db236f..e8e0a43ba27 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellActionBarContributor.java
@@ -49,7 +49,6 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattablecell model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablecellActionBarContributor

@@ -59,7 +58,6 @@ public class NattablecellActionBarContributor
 	 * This keeps track of the active editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IEditorPart activeEditorPart;

@@ -68,7 +66,6 @@ public class NattablecellActionBarContributor
 	 * This keeps track of the current selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionProvider selectionProvider;

@@ -77,56 +74,53 @@ public class NattablecellActionBarContributor
 	 * 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);

-					}

+		{

+			@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 boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

 

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

+			@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;

@@ -135,7 +129,6 @@ public class NattablecellActionBarContributor
 	 * 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;

@@ -145,7 +138,6 @@ public class NattablecellActionBarContributor
 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createSiblingActions;

@@ -154,7 +146,6 @@ public class NattablecellActionBarContributor
 	 * 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;

@@ -163,7 +154,6 @@ public class NattablecellActionBarContributor
 	 * This creates an instance of the contributor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattablecellActionBarContributor() {

@@ -177,7 +167,6 @@ public class NattablecellActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -191,7 +180,6 @@ public class NattablecellActionBarContributor
 	 * as well as the sub-menus for object creation items.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -218,11 +206,11 @@ public class NattablecellActionBarContributor
 		// Force an update because Eclipse hides empty menus now.

 		//

 		submenuManager.addMenuListener

-				(new IMenuListener() {

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

 

 		addGlobalActions(submenuManager);

 	}

@@ -231,7 +219,6 @@ public class NattablecellActionBarContributor
 	 * 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

@@ -265,7 +252,6 @@ public class NattablecellActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -285,10 +271,10 @@ public class NattablecellActionBarContributor
 		Collection<?> newSiblingDescriptors = null;

 

 		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

 

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

 

 			newChildDescriptors = domain.getNewChildDescriptors(object, null);

 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

@@ -314,7 +300,6 @@ public class NattablecellActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

@@ -332,7 +317,6 @@ public class NattablecellActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

@@ -352,7 +336,6 @@ public class NattablecellActionBarContributor
 	 * 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) {

@@ -373,7 +356,6 @@ public class NattablecellActionBarContributor
 	 * 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) {

@@ -384,13 +366,13 @@ public class NattablecellActionBarContributor
 				//

 				IContributionItem contributionItem = items[i];

 				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

 				}

 

 				// Delete the ActionContributionItems with matching action.

 				//

 				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

 					if (actions.contains(action)) {

 						manager.remove(contributionItem);

 					}

@@ -403,7 +385,6 @@ public class NattablecellActionBarContributor
 	 * This populates the pop-up menu before it appears.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -424,7 +405,6 @@ public class NattablecellActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -432,7 +412,7 @@ public class NattablecellActionBarContributor
 		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());

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

 		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

 

 		super.addGlobalActions(menuManager);

@@ -442,7 +422,6 @@ public class NattablecellActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
index 471d8f5412a..8c0cce6a71e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellEditor.java
@@ -145,7 +145,6 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattablecell model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablecellEditor

@@ -155,7 +154,6 @@ public class NattablecellEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AdapterFactoryEditingDomain editingDomain;

@@ -164,7 +162,6 @@ public class NattablecellEditor
 	 * This is the one adapter factory used for providing views of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory adapterFactory;

@@ -173,7 +170,6 @@ public class NattablecellEditor
 	 * This is the content outline page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IContentOutlinePage contentOutlinePage;

@@ -182,7 +178,6 @@ public class NattablecellEditor
 	 * This is a kludge...

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStatusLineManager contentOutlineStatusLineManager;

@@ -191,7 +186,6 @@ public class NattablecellEditor
 	 * This is the content outline page's viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer contentOutlineViewer;

@@ -200,7 +194,6 @@ public class NattablecellEditor
 	 * This is the property sheet page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

@@ -210,7 +203,6 @@ public class NattablecellEditor
 	 * The parent relation must be correctly defined for this to work.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer selectionViewer;

@@ -219,7 +211,6 @@ public class NattablecellEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer parentViewer;

@@ -228,7 +219,6 @@ public class NattablecellEditor
 	 * This shows how a tree view works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewer;

@@ -238,7 +228,6 @@ public class NattablecellEditor
 	 * A list viewer doesn't support icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ListViewer listViewer;

@@ -248,7 +237,6 @@ public class NattablecellEditor
 	 * A table can be used as a list with icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableViewer tableViewer;

@@ -257,7 +245,6 @@ public class NattablecellEditor
 	 * This shows how a tree view with columns works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewerWithColumns;

@@ -266,7 +253,6 @@ public class NattablecellEditor
 	 * This keeps track of the active viewer pane, in the book.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ViewerPane currentViewerPane;

@@ -275,7 +261,6 @@ public class NattablecellEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Viewer currentViewer;

@@ -284,7 +269,6 @@ public class NattablecellEditor
 	 * This listens to which ever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionChangedListener selectionChangedListener;

@@ -293,7 +277,6 @@ public class NattablecellEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

@@ -302,7 +285,6 @@ public class NattablecellEditor
 	 * This keeps track of the selection of the editor as a whole.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelection editorSelection = StructuredSelection.EMPTY;

@@ -312,7 +294,6 @@ public class NattablecellEditor
 	 * in Eclipse's Problems View.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

@@ -321,52 +302,46 @@ public class NattablecellEditor
 	 * This listens for when the outline becomes active

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IPartListener partListener =

 			new IPartListener() {

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(NattablecellEditor.this);

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(NattablecellEditor.this);

 

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(NattablecellEditor.this);

-							handleActivate();

-						}

+						setCurrentViewer(contentOutlineViewer);

 					}

-					else if (p == NattablecellEditor.this) {

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(NattablecellEditor.this);

 						handleActivate();

 					}

 				}

-

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

+				else if (p == NattablecellEditor.this) {

+					handleActivate();

 				}

-

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

 

 	/**

 	 * Resources that have been removed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> removedResources = new ArrayList<Resource>();

@@ -375,7 +350,6 @@ public class NattablecellEditor
 	 * Resources that have been changed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> changedResources = new ArrayList<Resource>();

@@ -384,7 +358,6 @@ public class NattablecellEditor
 	 * Resources that have been saved.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> savedResources = new ArrayList<Resource>();

@@ -393,7 +366,6 @@ public class NattablecellEditor
 	 * Map to store the diagnostic associated with a resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

@@ -402,7 +374,6 @@ public class NattablecellEditor
 	 * Controls whether the problem indication should be updated.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean updateProblemIndication = true;

@@ -411,19 +382,18 @@ public class NattablecellEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EContentAdapter problemIndicationAdapter =

 			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

 						case Resource.RESOURCE__IS_LOADED:

 						case Resource.RESOURCE__ERRORS:

 						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

+							Resource resource = (Resource)notification.getNotifier();

 							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

 							if (diagnostic.getSeverity() != Diagnostic.OK) {

 								resourceToDiagnosticMap.put(resource, diagnostic);

@@ -434,136 +404,134 @@ public class NattablecellEditor
 

 							if (updateProblemIndication) {

 								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											public void run() {

-												updateProblemIndication();

-											}

-										});

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

 							}

 							break;

 						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

 					}

 				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

+				else {

+					super.notifyChanged(notification);

 				}

+			}

 

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

 				}

-			};

+			}

+		};

 

 	/**

 	 * This listens for workspace changes.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IResourceChangeListener resourceChangeListener =

 			new IResourceChangeListener() {

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

 										}

 									}

-									return false;

 								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

+								return false;

 							}

 

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

+							return true;

 						}

 

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(NattablecellEditor.this, false);

-											}

-										}

-									});

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

 						}

 

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == NattablecellEditor.this) {

-												handleActivate();

-											}

-										}

-									});

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

 						}

 					}

-					catch (CoreException exception) {

-						NattableEditorPlugin.INSTANCE.log(exception);

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(NattablecellEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == NattablecellEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

 					}

 				}

-			};

+				catch (CoreException exception) {

+					NattableEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

 

 	/**

 	 * Handles activation of the editor or it's associated views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleActivate() {

 		// Recompute the read only state.

 		//

 		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

+		  editingDomain.getResourceToReadOnlyMap().clear();

 

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

 		}

 

 		if (!removedResources.isEmpty()) {

@@ -588,7 +556,6 @@ public class NattablecellEditor
 	 * Handles what to do with changed resources on activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleChangedResources() {

@@ -604,7 +571,8 @@ public class NattablecellEditor
 					resource.unload();

 					try {

 						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

+					}

+					catch (IOException exception) {

 						if (!resourceToDiagnosticMap.containsKey(resource)) {

 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

@@ -625,17 +593,17 @@ public class NattablecellEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void updateProblemIndication() {

 		if (updateProblemIndication) {

 			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

 			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

 				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

 					diagnostic.add(childDiagnostic);

@@ -644,7 +612,7 @@ public class NattablecellEditor
 

 			int lastEditorPage = getPageCount() - 1;

 			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					setActivePage(lastEditorPage);

 				}

@@ -658,7 +626,8 @@ public class NattablecellEditor
 					setPageText(lastEditorPage, problemEditorPart.getPartName());

 					setActivePage(lastEditorPage);

 					showTabs();

-				} catch (PartInitException exception) {

+				}

+				catch (PartInitException exception) {

 					NattableEditorPlugin.INSTANCE.log(exception);

 				}

 			}

@@ -668,7 +637,8 @@ public class NattablecellEditor
 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					try {

 						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

+					}

+					catch (CoreException exception) {

 						NattableEditorPlugin.INSTANCE.log(exception);

 					}

 				}

@@ -680,21 +650,20 @@ public class NattablecellEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

+		return

+			MessageDialog.openQuestion

 				(getSite().getShell(),

-						getString("_UI_FileConflict_label"), //$NON-NLS-1$

-						getString("_WARN_FileConflict")); //$NON-NLS-1$

+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

+				 getString("_WARN_FileConflict")); //$NON-NLS-1$

 	}

 

 	/**

 	 * This creates a model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattablecellEditor() {

@@ -706,7 +675,6 @@ public class NattablecellEditor
 	 * This sets up the editing domain for the model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void initializeEditingDomain() {

@@ -735,32 +703,32 @@ public class NattablecellEditor
 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

 		//

 		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

 

 		// Create the editing domain with a special command stack.

 		//

@@ -771,7 +739,6 @@ public class NattablecellEditor
 	 * This is here for the listener to be able to call it.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -783,7 +750,6 @@ public class NattablecellEditor
 	 * This sets the selection into whichever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setSelectionToViewer(Collection<?> collection) {

@@ -792,25 +758,25 @@ public class NattablecellEditor
 		//

 		if (theSelection != null && !theSelection.isEmpty()) {

 			Runnable runnable =

-					new Runnable() {

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

 						}

-					};

+					}

+				};

 			getSite().getShell().getDisplay().asyncExec(runnable);

 		}

 	}

 

 	/**

 	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -821,14 +787,12 @@ public class NattablecellEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

@@ -838,11 +802,10 @@ public class NattablecellEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getElements(Object object) {

+		public Object [] getElements(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -850,11 +813,10 @@ public class NattablecellEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getChildren(Object object) {

+		public Object [] getChildren(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -862,7 +824,6 @@ public class NattablecellEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -874,7 +835,6 @@ public class NattablecellEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -886,7 +846,6 @@ public class NattablecellEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewerPane(ViewerPane viewerPane) {

@@ -904,7 +863,6 @@ public class NattablecellEditor
 	 * is the current one.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewer(Viewer viewer) {

@@ -915,13 +873,13 @@ public class NattablecellEditor
 				// Create the listener on demand.

 				//

 				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

 			}

 

 			// Stop listening to the old one.

@@ -950,7 +908,6 @@ public class NattablecellEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -962,7 +919,6 @@ public class NattablecellEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void createContextMenuFor(StructuredViewer viewer) {

@@ -970,7 +926,7 @@ public class NattablecellEditor
 		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

 		contextMenu.setRemoveAllWhenShown(true);

 		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

 		viewer.getControl().setMenu(menu);

 		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

 

@@ -984,25 +940,25 @@ public class NattablecellEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

 		Exception exception = null;

 		Resource resource = null;

 		try {

 			// Load the resource through the editing domain.

 			//

 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

+		}

+		catch (Exception e) {

 			exception = e;

 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

 		}

 

 		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

 		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

 		}

 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

 	}

@@ -1012,25 +968,29 @@ public class NattablecellEditor
 	 * and the specified exception (if any).

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+		boolean hasErrors = !resource.getErrors().isEmpty();

+		if (hasErrors || !resource.getWarnings().isEmpty()) {

 			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-							new Object[] { exception == null ? (Object) resource : exception });

+				new BasicDiagnostic

+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object [] { exception == null ? (Object)resource : exception });

 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

 			return basicDiagnostic;

 		}

 		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					new Object[] { exception });

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object[] { exception });

 		}

 		else {

 			return Diagnostic.OK_INSTANCE;

@@ -1041,7 +1001,6 @@ public class NattablecellEditor
 	 * This is the method used by the framework to install your own controls.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1057,23 +1016,22 @@ public class NattablecellEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

 				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 

 				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1092,23 +1050,22 @@ public class NattablecellEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				parentViewer = (TreeViewer) viewerPane.getViewer();

+				parentViewer = (TreeViewer)viewerPane.getViewer();

 				parentViewer.setAutoExpandLevel(30);

 				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

 				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1122,20 +1079,19 @@ public class NattablecellEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

+				listViewer = (ListViewer)viewerPane.getViewer();

 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1148,20 +1104,19 @@ public class NattablecellEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

+				treeViewer = (TreeViewer)viewerPane.getViewer();

 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1176,20 +1131,19 @@ public class NattablecellEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

+				tableViewer = (TableViewer)viewerPane.getViewer();

 

 				Table table = tableViewer.getTable();

 				TableLayout layout = new TableLayout();

@@ -1207,7 +1161,7 @@ public class NattablecellEditor
 				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

 				selfColumn.setResizable(true);

 

-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1220,21 +1174,20 @@ public class NattablecellEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablecellEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

 

 				Tree tree = treeViewerWithColumns.getTree();

 				tree.setLayoutData(new FillLayout());

@@ -1251,7 +1204,7 @@ public class NattablecellEditor
 				selfColumn.setResizable(true);

 				selfColumn.setWidth(200);

 

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1261,36 +1214,35 @@ public class NattablecellEditor
 			}

 

 			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						public void run() {

-							setActivePage(0);

-						}

-					});

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

 		}

 

 		// Ensures that this editor will only display the page's tab

 		// area if there are more than one page

 		//

 		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

 					}

-				});

+				}

+			 });

 

 		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					public void run() {

-						updateProblemIndication();

-					}

-				});

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

 	}

 

 	/**

@@ -1298,14 +1250,13 @@ public class NattablecellEditor
 	 * this hides the single tab at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void hideTabs() {

 		if (getPageCount() <= 1) {

 			setPageText(0, ""); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

+				((CTabFolder)getContainer()).setTabHeight(1);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y + 6);

 			}

@@ -1317,14 +1268,13 @@ public class NattablecellEditor
 	 * this shows the tabs at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void showTabs() {

 		if (getPageCount() > 1) {

 			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y - 6);

 			}

@@ -1335,7 +1285,6 @@ public class NattablecellEditor
 	 * This is used to track the active viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1351,7 +1300,6 @@ public class NattablecellEditor
 	 * This is how the framework determines which interfaces we implement.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("rawtypes")

@@ -1375,7 +1323,6 @@ public class NattablecellEditor
 	 * This accesses a cached version of the content outliner.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IContentOutlinePage getContentOutlinePage() {

@@ -1400,9 +1347,9 @@ public class NattablecellEditor
 					createContextMenuFor(contentOutlineViewer);

 

 					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 					}

 				}

 

@@ -1424,13 +1371,13 @@ public class NattablecellEditor
 			// Listen to selection so that we can handle it is a special way.

 			//

 			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

 		}

 

 		return contentOutlinePage;

@@ -1440,24 +1387,23 @@ public class NattablecellEditor
 	 * This accesses a cached version of the property sheet.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

 		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						NattablecellEditor.this.setSelectionToViewer(selection);

-						NattablecellEditor.this.setFocus();

-					}

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					NattablecellEditor.this.setSelectionToViewer(selection);

+					NattablecellEditor.this.setFocus();

+				}

 

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

 		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

 		propertySheetPages.add(propertySheetPage);

 

@@ -1468,12 +1414,11 @@ public class NattablecellEditor
 	 * This deals with how we want selection in the outliner to affect the other views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void handleContentOutlineSelection(ISelection selection) {

 		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

 			if (selectedElements.hasNext()) {

 				// Get the first selected element.

 				//

@@ -1508,19 +1453,17 @@ public class NattablecellEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

 	}

 

 	/**

 	 * This is for implementing {@link IEditorPart} and simply saves the model file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1534,31 +1477,31 @@ public class NattablecellEditor
 		// Do the work within an operation because this is a long running activity that modifies the workbench.

 		//

 		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

 					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

 								}

-								first = false;

 							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

 						}

 					}

-				};

+				}

+			};

 

 		updateProblemIndication = false;

 		try {

@@ -1568,9 +1511,10 @@ public class NattablecellEditor
 

 			// Refresh the necessary state.

 			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

 			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			// Something went wrong that shouldn't.

 			//

 			NattableEditorPlugin.INSTANCE.log(exception);

@@ -1584,7 +1528,6 @@ public class NattablecellEditor
 	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean isPersisted(Resource resource) {

@@ -1595,7 +1538,8 @@ public class NattablecellEditor
 				result = true;

 				stream.close();

 			}

-		} catch (IOException e) {

+		}

+		catch (IOException e) {

 			// Ignore

 		}

 		return result;

@@ -1605,7 +1549,6 @@ public class NattablecellEditor
 	 * This always returns true because it is not currently supported.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1617,7 +1560,6 @@ public class NattablecellEditor
 	 * This also changes the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1636,7 +1578,6 @@ public class NattablecellEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void doSaveAs(URI uri, IEditorInput editorInput) {

@@ -1644,16 +1585,15 @@ public class NattablecellEditor
 		setInputWithNotify(editorInput);

 		setPartName(editorInput.getName());

 		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

 		doSave(progressMonitor);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1668,7 +1608,6 @@ public class NattablecellEditor
 	 * This is called during startup.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1684,7 +1623,6 @@ public class NattablecellEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1701,7 +1639,6 @@ public class NattablecellEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1713,7 +1650,6 @@ public class NattablecellEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1725,7 +1661,6 @@ public class NattablecellEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1738,7 +1673,6 @@ public class NattablecellEditor
 	 * Calling this result will notify the listeners.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1754,30 +1688,29 @@ public class NattablecellEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setStatusLineManager(ISelection selection) {

 		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

 

 		if (statusLineManager != null) {

 			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

 				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-					break;

-				}

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

+						break;

+					}

 				}

 			}

 			else {

@@ -1790,7 +1723,6 @@ public class NattablecellEditor
 	 * This looks up a string in the plugin's plugin.properties file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key) {

@@ -1801,39 +1733,35 @@ public class NattablecellEditor
 	 * This looks up a string in plugin.properties, making a substitution.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

 	}

 

 	/**

 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IActionBars getActionBars() {

@@ -1843,7 +1771,6 @@ public class NattablecellEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AdapterFactory getAdapterFactory() {

@@ -1853,7 +1780,6 @@ public class NattablecellEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1885,7 +1811,6 @@ public class NattablecellEditor
 	 * Returns whether the outline view should be presented to the user.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean showOutlineView() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
index a6cf0fb8100..86d032afb4c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/presentation/NattablecellModelWizard.java
@@ -75,7 +75,6 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablecellModelWizard extends Wizard implements INewWizard {

@@ -83,7 +82,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final List<String> FILE_EXTENSIONS =

@@ -93,7 +91,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final String FORMATTED_FILE_EXTENSIONS =

@@ -103,7 +100,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablecellPackage nattablecellPackage = NattablecellPackage.eINSTANCE;

@@ -112,7 +108,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablecellFactory nattablecellFactory = nattablecellPackage.getNattablecellFactory();

@@ -121,7 +116,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablecellModelWizardNewFileCreationPage newFileCreationPage;

@@ -130,7 +124,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablecellModelWizardInitialObjectCreationPage initialObjectCreationPage;

@@ -139,7 +132,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStructuredSelection selection;

@@ -148,7 +140,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IWorkbench workbench;

@@ -157,7 +148,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<String> initialObjectNames;

@@ -166,7 +156,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -181,7 +170,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<String> getInitialObjectNames() {

@@ -189,7 +177,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 			initialObjectNames = new ArrayList<String>();

 			for (EClassifier eClassifier : nattablecellPackage.getEClassifiers()) {

 				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

+					EClass eClass = (EClass)eClassifier;

 					if (!eClass.isAbstract()) {

 						initialObjectNames.add(eClass.getName());

 					}

@@ -204,11 +192,10 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObject createInitialModel() {

-		EClass eClass = (EClass) nattablecellPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EClass eClass = (EClass)nattablecellPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

 		EObject rootObject = nattablecellFactory.create(eClass);

 		return rootObject;

 	}

@@ -217,7 +204,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -230,43 +216,43 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 			// Do the work within an operation.

 			//

 			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								NattableEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

 							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							NattableEditorPlugin.INSTANCE.log(exception);

 						}

-					};

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

 

 			getContainer().run(false, false, operation);

 

@@ -278,26 +264,28 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 			if (activePart instanceof ISetSelectionTarget) {

 				final ISelection targetSelection = new StructuredSelection(modelFile);

 				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

 			}

 

 			// Open an editor on the new file.

 			//

 			try {

 				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

 				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

 				return false;

 			}

 

 			return true;

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			NattableEditorPlugin.INSTANCE.log(exception);

 			return false;

 		}

@@ -307,7 +295,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattablecellModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

@@ -315,7 +302,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattablecellModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

@@ -326,7 +312,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -335,7 +320,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 				String extension = new Path(getFileName()).getFileExtension();

 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

 					return false;

 				}

 				return true;

@@ -346,7 +331,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public IFile getModelFile() {

@@ -358,14 +342,12 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattablecellModelWizardInitialObjectCreationPage extends WizardPage {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo initialObjectField;

@@ -380,7 +362,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo encodingField;

@@ -389,7 +370,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattablecellModelWizardInitialObjectCreationPage(String pageId) {

@@ -399,13 +379,11 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

 		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

+			Composite composite = new Composite(parent, SWT.NONE); {

 				GridLayout layout = new GridLayout();

 				layout.numColumns = 1;

 				layout.verticalSpacing = 12;

@@ -474,20 +452,18 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected ModifyListener validator =

 				new ModifyListener() {

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected boolean validatePage() {

@@ -497,7 +473,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -518,7 +493,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getInitialObjectName() {

@@ -535,7 +509,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getEncoding() {

@@ -546,13 +519,13 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected String getLabel(String typeName) {

 			try {

 				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (MissingResourceException mre) {

+			}

+			catch(MissingResourceException mre) {

 				NattableEditorPlugin.INSTANCE.log(mre);

 			}

 			return typeName;

@@ -561,13 +534,12 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Collection<String> getEncodings() {

 			if (encodings == null) {

 				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$

+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

 				{

 					encodings.add(stringTokenizer.nextToken());

 				}

@@ -580,7 +552,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -602,7 +573,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 			if (selectedElement instanceof IResource) {

 				// Get the resource parent, if its a file.

 				//

-				IResource selectedResource = (IResource) selectedElement;

+				IResource selectedResource = (IResource)selectedElement;

 				if (selectedResource.getType() == IResource.FILE) {

 					selectedResource = selectedResource.getParent();

 				}

@@ -619,7 +590,7 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattablecellEditorFilenameDefaultBase"); //$NON-NLS-1$

 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

 					}

 					newFileCreationPage.setFileName(modelFilename);

@@ -636,7 +607,6 @@ public class NattablecellModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IFile getModelFile() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
index 4a46a9f69f5..7520989f192 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
@@ -49,7 +49,6 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattableconfiguration model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableconfigurationActionBarContributor

@@ -59,7 +58,6 @@ public class NattableconfigurationActionBarContributor
 	 * This keeps track of the active editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IEditorPart activeEditorPart;

@@ -68,7 +66,6 @@ public class NattableconfigurationActionBarContributor
 	 * This keeps track of the current selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionProvider selectionProvider;

@@ -77,56 +74,53 @@ public class NattableconfigurationActionBarContributor
 	 * 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);

-					}

+		{

+			@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 boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

 

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

+			@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;

@@ -135,7 +129,6 @@ public class NattableconfigurationActionBarContributor
 	 * 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;

@@ -145,7 +138,6 @@ public class NattableconfigurationActionBarContributor
 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createSiblingActions;

@@ -154,7 +146,6 @@ public class NattableconfigurationActionBarContributor
 	 * 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;

@@ -163,7 +154,6 @@ public class NattableconfigurationActionBarContributor
 	 * This creates an instance of the contributor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableconfigurationActionBarContributor() {

@@ -177,7 +167,6 @@ public class NattableconfigurationActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -191,7 +180,6 @@ public class NattableconfigurationActionBarContributor
 	 * as well as the sub-menus for object creation items.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -218,11 +206,11 @@ public class NattableconfigurationActionBarContributor
 		// Force an update because Eclipse hides empty menus now.

 		//

 		submenuManager.addMenuListener

-				(new IMenuListener() {

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

 

 		addGlobalActions(submenuManager);

 	}

@@ -231,7 +219,6 @@ public class NattableconfigurationActionBarContributor
 	 * 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

@@ -265,7 +252,6 @@ public class NattableconfigurationActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -285,10 +271,10 @@ public class NattableconfigurationActionBarContributor
 		Collection<?> newSiblingDescriptors = null;

 

 		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

 

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

 

 			newChildDescriptors = domain.getNewChildDescriptors(object, null);

 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

@@ -314,7 +300,6 @@ public class NattableconfigurationActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

@@ -332,7 +317,6 @@ public class NattableconfigurationActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

@@ -352,7 +336,6 @@ public class NattableconfigurationActionBarContributor
 	 * 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) {

@@ -373,7 +356,6 @@ public class NattableconfigurationActionBarContributor
 	 * 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) {

@@ -384,13 +366,13 @@ public class NattableconfigurationActionBarContributor
 				//

 				IContributionItem contributionItem = items[i];

 				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

 				}

 

 				// Delete the ActionContributionItems with matching action.

 				//

 				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

 					if (actions.contains(action)) {

 						manager.remove(contributionItem);

 					}

@@ -403,7 +385,6 @@ public class NattableconfigurationActionBarContributor
 	 * This populates the pop-up menu before it appears.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -424,7 +405,6 @@ public class NattableconfigurationActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -432,7 +412,7 @@ public class NattableconfigurationActionBarContributor
 		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());

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

 		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

 

 		super.addGlobalActions(menuManager);

@@ -442,7 +422,6 @@ public class NattableconfigurationActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
index aec5e90b166..5578e317e62 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
@@ -145,7 +145,6 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattableconfiguration model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableconfigurationEditor

@@ -155,7 +154,6 @@ public class NattableconfigurationEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AdapterFactoryEditingDomain editingDomain;

@@ -164,7 +162,6 @@ public class NattableconfigurationEditor
 	 * This is the one adapter factory used for providing views of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory adapterFactory;

@@ -173,7 +170,6 @@ public class NattableconfigurationEditor
 	 * This is the content outline page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IContentOutlinePage contentOutlinePage;

@@ -182,7 +178,6 @@ public class NattableconfigurationEditor
 	 * This is a kludge...

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStatusLineManager contentOutlineStatusLineManager;

@@ -191,7 +186,6 @@ public class NattableconfigurationEditor
 	 * This is the content outline page's viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer contentOutlineViewer;

@@ -200,7 +194,6 @@ public class NattableconfigurationEditor
 	 * This is the property sheet page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

@@ -210,7 +203,6 @@ public class NattableconfigurationEditor
 	 * The parent relation must be correctly defined for this to work.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer selectionViewer;

@@ -219,7 +211,6 @@ public class NattableconfigurationEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer parentViewer;

@@ -228,7 +219,6 @@ public class NattableconfigurationEditor
 	 * This shows how a tree view works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewer;

@@ -238,7 +228,6 @@ public class NattableconfigurationEditor
 	 * A list viewer doesn't support icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ListViewer listViewer;

@@ -248,7 +237,6 @@ public class NattableconfigurationEditor
 	 * A table can be used as a list with icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableViewer tableViewer;

@@ -257,7 +245,6 @@ public class NattableconfigurationEditor
 	 * This shows how a tree view with columns works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewerWithColumns;

@@ -266,7 +253,6 @@ public class NattableconfigurationEditor
 	 * This keeps track of the active viewer pane, in the book.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ViewerPane currentViewerPane;

@@ -275,7 +261,6 @@ public class NattableconfigurationEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Viewer currentViewer;

@@ -284,7 +269,6 @@ public class NattableconfigurationEditor
 	 * This listens to which ever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionChangedListener selectionChangedListener;

@@ -293,7 +277,6 @@ public class NattableconfigurationEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

@@ -302,7 +285,6 @@ public class NattableconfigurationEditor
 	 * This keeps track of the selection of the editor as a whole.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelection editorSelection = StructuredSelection.EMPTY;

@@ -312,7 +294,6 @@ public class NattableconfigurationEditor
 	 * in Eclipse's Problems View.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

@@ -321,52 +302,46 @@ public class NattableconfigurationEditor
 	 * This listens for when the outline becomes active

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IPartListener partListener =

 			new IPartListener() {

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(NattableconfigurationEditor.this);

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(NattableconfigurationEditor.this);

 

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(NattableconfigurationEditor.this);

-							handleActivate();

-						}

+						setCurrentViewer(contentOutlineViewer);

 					}

-					else if (p == NattableconfigurationEditor.this) {

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(NattableconfigurationEditor.this);

 						handleActivate();

 					}

 				}

-

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

+				else if (p == NattableconfigurationEditor.this) {

+					handleActivate();

 				}

-

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

 

 	/**

 	 * Resources that have been removed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> removedResources = new ArrayList<Resource>();

@@ -375,7 +350,6 @@ public class NattableconfigurationEditor
 	 * Resources that have been changed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> changedResources = new ArrayList<Resource>();

@@ -384,7 +358,6 @@ public class NattableconfigurationEditor
 	 * Resources that have been saved.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> savedResources = new ArrayList<Resource>();

@@ -393,7 +366,6 @@ public class NattableconfigurationEditor
 	 * Map to store the diagnostic associated with a resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

@@ -402,7 +374,6 @@ public class NattableconfigurationEditor
 	 * Controls whether the problem indication should be updated.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean updateProblemIndication = true;

@@ -411,19 +382,18 @@ public class NattableconfigurationEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EContentAdapter problemIndicationAdapter =

 			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

 						case Resource.RESOURCE__IS_LOADED:

 						case Resource.RESOURCE__ERRORS:

 						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

+							Resource resource = (Resource)notification.getNotifier();

 							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

 							if (diagnostic.getSeverity() != Diagnostic.OK) {

 								resourceToDiagnosticMap.put(resource, diagnostic);

@@ -434,136 +404,134 @@ public class NattableconfigurationEditor
 

 							if (updateProblemIndication) {

 								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											public void run() {

-												updateProblemIndication();

-											}

-										});

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

 							}

 							break;

 						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

 					}

 				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

+				else {

+					super.notifyChanged(notification);

 				}

+			}

 

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

 				}

-			};

+			}

+		};

 

 	/**

 	 * This listens for workspace changes.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IResourceChangeListener resourceChangeListener =

 			new IResourceChangeListener() {

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

 										}

 									}

-									return false;

 								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

+								return false;

 							}

 

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

+							return true;

 						}

 

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(NattableconfigurationEditor.this, false);

-											}

-										}

-									});

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

 						}

 

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == NattableconfigurationEditor.this) {

-												handleActivate();

-											}

-										}

-									});

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

 						}

 					}

-					catch (CoreException exception) {

-						NattableEditorPlugin.INSTANCE.log(exception);

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(NattableconfigurationEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == NattableconfigurationEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

 					}

 				}

-			};

+				catch (CoreException exception) {

+					NattableEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

 

 	/**

 	 * Handles activation of the editor or it's associated views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleActivate() {

 		// Recompute the read only state.

 		//

 		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

+		  editingDomain.getResourceToReadOnlyMap().clear();

 

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

 		}

 

 		if (!removedResources.isEmpty()) {

@@ -588,7 +556,6 @@ public class NattableconfigurationEditor
 	 * Handles what to do with changed resources on activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleChangedResources() {

@@ -604,7 +571,8 @@ public class NattableconfigurationEditor
 					resource.unload();

 					try {

 						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

+					}

+					catch (IOException exception) {

 						if (!resourceToDiagnosticMap.containsKey(resource)) {

 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

@@ -625,17 +593,17 @@ public class NattableconfigurationEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void updateProblemIndication() {

 		if (updateProblemIndication) {

 			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

 			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

 				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

 					diagnostic.add(childDiagnostic);

@@ -644,7 +612,7 @@ public class NattableconfigurationEditor
 

 			int lastEditorPage = getPageCount() - 1;

 			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					setActivePage(lastEditorPage);

 				}

@@ -658,7 +626,8 @@ public class NattableconfigurationEditor
 					setPageText(lastEditorPage, problemEditorPart.getPartName());

 					setActivePage(lastEditorPage);

 					showTabs();

-				} catch (PartInitException exception) {

+				}

+				catch (PartInitException exception) {

 					NattableEditorPlugin.INSTANCE.log(exception);

 				}

 			}

@@ -668,7 +637,8 @@ public class NattableconfigurationEditor
 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					try {

 						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

+					}

+					catch (CoreException exception) {

 						NattableEditorPlugin.INSTANCE.log(exception);

 					}

 				}

@@ -680,21 +650,20 @@ public class NattableconfigurationEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

+		return

+			MessageDialog.openQuestion

 				(getSite().getShell(),

-						getString("_UI_FileConflict_label"), //$NON-NLS-1$

-						getString("_WARN_FileConflict")); //$NON-NLS-1$

+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

+				 getString("_WARN_FileConflict")); //$NON-NLS-1$

 	}

 

 	/**

 	 * This creates a model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableconfigurationEditor() {

@@ -706,7 +675,6 @@ public class NattableconfigurationEditor
 	 * This sets up the editing domain for the model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void initializeEditingDomain() {

@@ -735,32 +703,32 @@ public class NattableconfigurationEditor
 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

 		//

 		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

 

 		// Create the editing domain with a special command stack.

 		//

@@ -771,7 +739,6 @@ public class NattableconfigurationEditor
 	 * This is here for the listener to be able to call it.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -783,7 +750,6 @@ public class NattableconfigurationEditor
 	 * This sets the selection into whichever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setSelectionToViewer(Collection<?> collection) {

@@ -792,25 +758,25 @@ public class NattableconfigurationEditor
 		//

 		if (theSelection != null && !theSelection.isEmpty()) {

 			Runnable runnable =

-					new Runnable() {

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

 						}

-					};

+					}

+				};

 			getSite().getShell().getDisplay().asyncExec(runnable);

 		}

 	}

 

 	/**

 	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -821,14 +787,12 @@ public class NattableconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

@@ -838,11 +802,10 @@ public class NattableconfigurationEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getElements(Object object) {

+		public Object [] getElements(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -850,11 +813,10 @@ public class NattableconfigurationEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getChildren(Object object) {

+		public Object [] getChildren(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -862,7 +824,6 @@ public class NattableconfigurationEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -874,7 +835,6 @@ public class NattableconfigurationEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -886,7 +846,6 @@ public class NattableconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewerPane(ViewerPane viewerPane) {

@@ -904,7 +863,6 @@ public class NattableconfigurationEditor
 	 * is the current one.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewer(Viewer viewer) {

@@ -915,13 +873,13 @@ public class NattableconfigurationEditor
 				// Create the listener on demand.

 				//

 				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

 			}

 

 			// Stop listening to the old one.

@@ -950,7 +908,6 @@ public class NattableconfigurationEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -962,7 +919,6 @@ public class NattableconfigurationEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void createContextMenuFor(StructuredViewer viewer) {

@@ -970,7 +926,7 @@ public class NattableconfigurationEditor
 		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

 		contextMenu.setRemoveAllWhenShown(true);

 		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

 		viewer.getControl().setMenu(menu);

 		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

 

@@ -984,25 +940,25 @@ public class NattableconfigurationEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

 		Exception exception = null;

 		Resource resource = null;

 		try {

 			// Load the resource through the editing domain.

 			//

 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

+		}

+		catch (Exception e) {

 			exception = e;

 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

 		}

 

 		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

 		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

 		}

 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

 	}

@@ -1012,25 +968,29 @@ public class NattableconfigurationEditor
 	 * and the specified exception (if any).

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+		boolean hasErrors = !resource.getErrors().isEmpty();

+		if (hasErrors || !resource.getWarnings().isEmpty()) {

 			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-							new Object[] { exception == null ? (Object) resource : exception });

+				new BasicDiagnostic

+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object [] { exception == null ? (Object)resource : exception });

 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

 			return basicDiagnostic;

 		}

 		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					new Object[] { exception });

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object[] { exception });

 		}

 		else {

 			return Diagnostic.OK_INSTANCE;

@@ -1041,7 +1001,6 @@ public class NattableconfigurationEditor
 	 * This is the method used by the framework to install your own controls.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1057,23 +1016,22 @@ public class NattableconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

 				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 

 				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1092,23 +1050,22 @@ public class NattableconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				parentViewer = (TreeViewer) viewerPane.getViewer();

+				parentViewer = (TreeViewer)viewerPane.getViewer();

 				parentViewer.setAutoExpandLevel(30);

 				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

 				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1122,20 +1079,19 @@ public class NattableconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

+				listViewer = (ListViewer)viewerPane.getViewer();

 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1148,20 +1104,19 @@ public class NattableconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

+				treeViewer = (TreeViewer)viewerPane.getViewer();

 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1176,20 +1131,19 @@ public class NattableconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

+				tableViewer = (TableViewer)viewerPane.getViewer();

 

 				Table table = tableViewer.getTable();

 				TableLayout layout = new TableLayout();

@@ -1207,7 +1161,7 @@ public class NattableconfigurationEditor
 				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

 				selfColumn.setResizable(true);

 

-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1220,21 +1174,20 @@ public class NattableconfigurationEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableconfigurationEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

 

 				Tree tree = treeViewerWithColumns.getTree();

 				tree.setLayoutData(new FillLayout());

@@ -1251,7 +1204,7 @@ public class NattableconfigurationEditor
 				selfColumn.setResizable(true);

 				selfColumn.setWidth(200);

 

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1261,36 +1214,35 @@ public class NattableconfigurationEditor
 			}

 

 			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						public void run() {

-							setActivePage(0);

-						}

-					});

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

 		}

 

 		// Ensures that this editor will only display the page's tab

 		// area if there are more than one page

 		//

 		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

 					}

-				});

+				}

+			 });

 

 		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					public void run() {

-						updateProblemIndication();

-					}

-				});

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

 	}

 

 	/**

@@ -1298,14 +1250,13 @@ public class NattableconfigurationEditor
 	 * this hides the single tab at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void hideTabs() {

 		if (getPageCount() <= 1) {

 			setPageText(0, ""); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

+				((CTabFolder)getContainer()).setTabHeight(1);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y + 6);

 			}

@@ -1317,14 +1268,13 @@ public class NattableconfigurationEditor
 	 * this shows the tabs at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void showTabs() {

 		if (getPageCount() > 1) {

 			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y - 6);

 			}

@@ -1335,7 +1285,6 @@ public class NattableconfigurationEditor
 	 * This is used to track the active viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1351,7 +1300,6 @@ public class NattableconfigurationEditor
 	 * This is how the framework determines which interfaces we implement.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("rawtypes")

@@ -1375,7 +1323,6 @@ public class NattableconfigurationEditor
 	 * This accesses a cached version of the content outliner.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IContentOutlinePage getContentOutlinePage() {

@@ -1400,9 +1347,9 @@ public class NattableconfigurationEditor
 					createContextMenuFor(contentOutlineViewer);

 

 					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 					}

 				}

 

@@ -1424,13 +1371,13 @@ public class NattableconfigurationEditor
 			// Listen to selection so that we can handle it is a special way.

 			//

 			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

 		}

 

 		return contentOutlinePage;

@@ -1440,24 +1387,23 @@ public class NattableconfigurationEditor
 	 * This accesses a cached version of the property sheet.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

 		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						NattableconfigurationEditor.this.setSelectionToViewer(selection);

-						NattableconfigurationEditor.this.setFocus();

-					}

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					NattableconfigurationEditor.this.setSelectionToViewer(selection);

+					NattableconfigurationEditor.this.setFocus();

+				}

 

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

 		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

 		propertySheetPages.add(propertySheetPage);

 

@@ -1468,12 +1414,11 @@ public class NattableconfigurationEditor
 	 * This deals with how we want selection in the outliner to affect the other views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void handleContentOutlineSelection(ISelection selection) {

 		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

 			if (selectedElements.hasNext()) {

 				// Get the first selected element.

 				//

@@ -1508,19 +1453,17 @@ public class NattableconfigurationEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

 	}

 

 	/**

 	 * This is for implementing {@link IEditorPart} and simply saves the model file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1534,31 +1477,31 @@ public class NattableconfigurationEditor
 		// Do the work within an operation because this is a long running activity that modifies the workbench.

 		//

 		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

 					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

 								}

-								first = false;

 							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

 						}

 					}

-				};

+				}

+			};

 

 		updateProblemIndication = false;

 		try {

@@ -1568,9 +1511,10 @@ public class NattableconfigurationEditor
 

 			// Refresh the necessary state.

 			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

 			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			// Something went wrong that shouldn't.

 			//

 			NattableEditorPlugin.INSTANCE.log(exception);

@@ -1584,7 +1528,6 @@ public class NattableconfigurationEditor
 	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean isPersisted(Resource resource) {

@@ -1595,7 +1538,8 @@ public class NattableconfigurationEditor
 				result = true;

 				stream.close();

 			}

-		} catch (IOException e) {

+		}

+		catch (IOException e) {

 			// Ignore

 		}

 		return result;

@@ -1605,7 +1549,6 @@ public class NattableconfigurationEditor
 	 * This always returns true because it is not currently supported.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1617,7 +1560,6 @@ public class NattableconfigurationEditor
 	 * This also changes the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1636,7 +1578,6 @@ public class NattableconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void doSaveAs(URI uri, IEditorInput editorInput) {

@@ -1644,16 +1585,15 @@ public class NattableconfigurationEditor
 		setInputWithNotify(editorInput);

 		setPartName(editorInput.getName());

 		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

 		doSave(progressMonitor);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1668,7 +1608,6 @@ public class NattableconfigurationEditor
 	 * This is called during startup.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1684,7 +1623,6 @@ public class NattableconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1701,7 +1639,6 @@ public class NattableconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1713,7 +1650,6 @@ public class NattableconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1725,7 +1661,6 @@ public class NattableconfigurationEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1738,7 +1673,6 @@ public class NattableconfigurationEditor
 	 * Calling this result will notify the listeners.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1754,30 +1688,29 @@ public class NattableconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setStatusLineManager(ISelection selection) {

 		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

 

 		if (statusLineManager != null) {

 			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

 				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-					break;

-				}

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

+						break;

+					}

 				}

 			}

 			else {

@@ -1790,7 +1723,6 @@ public class NattableconfigurationEditor
 	 * This looks up a string in the plugin's plugin.properties file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key) {

@@ -1801,39 +1733,35 @@ public class NattableconfigurationEditor
 	 * This looks up a string in plugin.properties, making a substitution.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

 	}

 

 	/**

 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IActionBars getActionBars() {

@@ -1843,7 +1771,6 @@ public class NattableconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AdapterFactory getAdapterFactory() {

@@ -1853,7 +1780,6 @@ public class NattableconfigurationEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1885,7 +1811,6 @@ public class NattableconfigurationEditor
 	 * Returns whether the outline view should be presented to the user.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean showOutlineView() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
index 06ceab1a094..7582e3df289 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
@@ -75,7 +75,6 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableconfigurationModelWizard extends Wizard implements INewWizard {

@@ -83,7 +82,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * The supported extensions for created files.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final List<String> FILE_EXTENSIONS =

@@ -93,7 +91,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * A formatted list of supported file extensions, suitable for display.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final String FORMATTED_FILE_EXTENSIONS =

@@ -103,7 +100,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This caches an instance of the model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableconfigurationPackage nattableconfigurationPackage = NattableconfigurationPackage.eINSTANCE;

@@ -112,7 +108,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This caches an instance of the model factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableconfigurationFactory nattableconfigurationFactory = nattableconfigurationPackage.getNattableconfigurationFactory();

@@ -121,7 +116,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This is the file creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableconfigurationModelWizardNewFileCreationPage newFileCreationPage;

@@ -130,7 +124,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This is the initial object creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableconfigurationModelWizardInitialObjectCreationPage initialObjectCreationPage;

@@ -139,7 +132,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Remember the selection during initialization for populating the default container.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStructuredSelection selection;

@@ -148,7 +140,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Remember the workbench during initialization.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IWorkbench workbench;

@@ -157,7 +148,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Caches the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<String> initialObjectNames;

@@ -166,7 +156,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This just records the information.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -181,7 +170,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Returns the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<String> getInitialObjectNames() {

@@ -189,7 +177,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 			initialObjectNames = new ArrayList<String>();

 			for (EClassifier eClassifier : nattableconfigurationPackage.getEClassifiers()) {

 				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

+					EClass eClass = (EClass)eClassifier;

 					if (!eClass.isAbstract()) {

 						initialObjectNames.add(eClass.getName());

 					}

@@ -204,11 +192,10 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Create a new model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObject createInitialModel() {

-		EClass eClass = (EClass) nattableconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EClass eClass = (EClass)nattableconfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

 		EObject rootObject = nattableconfigurationFactory.create(eClass);

 		return rootObject;

 	}

@@ -217,7 +204,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Do the work after everything is specified.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -230,43 +216,43 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 			// Do the work within an operation.

 			//

 			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								NattableEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

 							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							NattableEditorPlugin.INSTANCE.log(exception);

 						}

-					};

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

 

 			getContainer().run(false, false, operation);

 

@@ -278,26 +264,28 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 			if (activePart instanceof ISetSelectionTarget) {

 				final ISelection targetSelection = new StructuredSelection(modelFile);

 				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

 			}

 

 			// Open an editor on the new file.

 			//

 			try {

 				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

 				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

 				return false;

 			}

 

 			return true;

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			NattableEditorPlugin.INSTANCE.log(exception);

 			return false;

 		}

@@ -307,7 +295,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This is the one page of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableconfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

@@ -315,7 +302,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableconfigurationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

@@ -326,7 +312,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		 * The framework calls this to see if the file is correct.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -335,7 +320,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 				String extension = new Path(getFileName()).getFileExtension();

 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

 					return false;

 				}

 				return true;

@@ -346,7 +331,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public IFile getModelFile() {

@@ -358,14 +342,12 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * This is the page where the type of object to create is selected.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableconfigurationModelWizardInitialObjectCreationPage extends WizardPage {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo initialObjectField;

@@ -380,7 +362,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo encodingField;

@@ -389,7 +370,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableconfigurationModelWizardInitialObjectCreationPage(String pageId) {

@@ -399,13 +379,11 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

 		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

+			Composite composite = new Composite(parent, SWT.NONE); {

 				GridLayout layout = new GridLayout();

 				layout.numColumns = 1;

 				layout.verticalSpacing = 12;

@@ -474,20 +452,18 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected ModifyListener validator =

 				new ModifyListener() {

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected boolean validatePage() {

@@ -497,7 +473,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -518,7 +493,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getInitialObjectName() {

@@ -535,7 +509,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getEncoding() {

@@ -546,13 +519,13 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		 * Returns the label for the specified type name.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected String getLabel(String typeName) {

 			try {

 				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (MissingResourceException mre) {

+			}

+			catch(MissingResourceException mre) {

 				NattableEditorPlugin.INSTANCE.log(mre);

 			}

 			return typeName;

@@ -561,13 +534,12 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Collection<String> getEncodings() {

 			if (encodings == null) {

 				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$

+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

 				{

 					encodings.add(stringTokenizer.nextToken());

 				}

@@ -580,7 +552,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * The framework calls this to create the contents of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -602,7 +573,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 			if (selectedElement instanceof IResource) {

 				// Get the resource parent, if its a file.

 				//

-				IResource selectedResource = (IResource) selectedElement;

+				IResource selectedResource = (IResource)selectedElement;

 				if (selectedResource.getType() == IResource.FILE) {

 					selectedResource = selectedResource.getParent();

 				}

@@ -619,7 +590,7 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableconfigurationEditorFilenameDefaultBase"); //$NON-NLS-1$

 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

 					}

 					newFileCreationPage.setFileName(modelFilename);

@@ -636,7 +607,6 @@ public class NattableconfigurationModelWizard extends Wizard implements INewWiza
 	 * Get the file from the page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IFile getModelFile() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
index 3ac8a6f85a2..282cbe60fa0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
@@ -49,7 +49,6 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattablelabelprovider model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablelabelproviderActionBarContributor

@@ -59,7 +58,6 @@ public class NattablelabelproviderActionBarContributor
 	 * This keeps track of the active editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IEditorPart activeEditorPart;

@@ -68,7 +66,6 @@ public class NattablelabelproviderActionBarContributor
 	 * This keeps track of the current selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionProvider selectionProvider;

@@ -77,56 +74,53 @@ public class NattablelabelproviderActionBarContributor
 	 * 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);

-					}

+		{

+			@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 boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

 

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

+			@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;

@@ -135,7 +129,6 @@ public class NattablelabelproviderActionBarContributor
 	 * 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;

@@ -145,7 +138,6 @@ public class NattablelabelproviderActionBarContributor
 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createSiblingActions;

@@ -154,7 +146,6 @@ public class NattablelabelproviderActionBarContributor
 	 * 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;

@@ -163,7 +154,6 @@ public class NattablelabelproviderActionBarContributor
 	 * This creates an instance of the contributor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattablelabelproviderActionBarContributor() {

@@ -177,7 +167,6 @@ public class NattablelabelproviderActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -191,7 +180,6 @@ public class NattablelabelproviderActionBarContributor
 	 * as well as the sub-menus for object creation items.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -218,11 +206,11 @@ public class NattablelabelproviderActionBarContributor
 		// Force an update because Eclipse hides empty menus now.

 		//

 		submenuManager.addMenuListener

-				(new IMenuListener() {

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

 

 		addGlobalActions(submenuManager);

 	}

@@ -231,7 +219,6 @@ public class NattablelabelproviderActionBarContributor
 	 * 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

@@ -265,7 +252,6 @@ public class NattablelabelproviderActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -285,10 +271,10 @@ public class NattablelabelproviderActionBarContributor
 		Collection<?> newSiblingDescriptors = null;

 

 		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

 

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

 

 			newChildDescriptors = domain.getNewChildDescriptors(object, null);

 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

@@ -314,7 +300,6 @@ public class NattablelabelproviderActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

@@ -332,7 +317,6 @@ public class NattablelabelproviderActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

@@ -352,7 +336,6 @@ public class NattablelabelproviderActionBarContributor
 	 * 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) {

@@ -373,7 +356,6 @@ public class NattablelabelproviderActionBarContributor
 	 * 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) {

@@ -384,13 +366,13 @@ public class NattablelabelproviderActionBarContributor
 				//

 				IContributionItem contributionItem = items[i];

 				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

 				}

 

 				// Delete the ActionContributionItems with matching action.

 				//

 				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

 					if (actions.contains(action)) {

 						manager.remove(contributionItem);

 					}

@@ -403,7 +385,6 @@ public class NattablelabelproviderActionBarContributor
 	 * This populates the pop-up menu before it appears.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -424,7 +405,6 @@ public class NattablelabelproviderActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -432,7 +412,7 @@ public class NattablelabelproviderActionBarContributor
 		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());

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

 		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

 

 		super.addGlobalActions(menuManager);

@@ -442,7 +422,6 @@ public class NattablelabelproviderActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
index 75aba22402b..45757ce9536 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
@@ -145,7 +145,6 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattablelabelprovider model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablelabelproviderEditor

@@ -155,7 +154,6 @@ public class NattablelabelproviderEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AdapterFactoryEditingDomain editingDomain;

@@ -164,7 +162,6 @@ public class NattablelabelproviderEditor
 	 * This is the one adapter factory used for providing views of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory adapterFactory;

@@ -173,7 +170,6 @@ public class NattablelabelproviderEditor
 	 * This is the content outline page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IContentOutlinePage contentOutlinePage;

@@ -182,7 +178,6 @@ public class NattablelabelproviderEditor
 	 * This is a kludge...

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStatusLineManager contentOutlineStatusLineManager;

@@ -191,7 +186,6 @@ public class NattablelabelproviderEditor
 	 * This is the content outline page's viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer contentOutlineViewer;

@@ -200,7 +194,6 @@ public class NattablelabelproviderEditor
 	 * This is the property sheet page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

@@ -210,7 +203,6 @@ public class NattablelabelproviderEditor
 	 * The parent relation must be correctly defined for this to work.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer selectionViewer;

@@ -219,7 +211,6 @@ public class NattablelabelproviderEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer parentViewer;

@@ -228,7 +219,6 @@ public class NattablelabelproviderEditor
 	 * This shows how a tree view works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewer;

@@ -238,7 +228,6 @@ public class NattablelabelproviderEditor
 	 * A list viewer doesn't support icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ListViewer listViewer;

@@ -248,7 +237,6 @@ public class NattablelabelproviderEditor
 	 * A table can be used as a list with icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableViewer tableViewer;

@@ -257,7 +245,6 @@ public class NattablelabelproviderEditor
 	 * This shows how a tree view with columns works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewerWithColumns;

@@ -266,7 +253,6 @@ public class NattablelabelproviderEditor
 	 * This keeps track of the active viewer pane, in the book.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ViewerPane currentViewerPane;

@@ -275,7 +261,6 @@ public class NattablelabelproviderEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Viewer currentViewer;

@@ -284,7 +269,6 @@ public class NattablelabelproviderEditor
 	 * This listens to which ever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionChangedListener selectionChangedListener;

@@ -293,7 +277,6 @@ public class NattablelabelproviderEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

@@ -302,7 +285,6 @@ public class NattablelabelproviderEditor
 	 * This keeps track of the selection of the editor as a whole.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelection editorSelection = StructuredSelection.EMPTY;

@@ -312,7 +294,6 @@ public class NattablelabelproviderEditor
 	 * in Eclipse's Problems View.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

@@ -321,52 +302,46 @@ public class NattablelabelproviderEditor
 	 * This listens for when the outline becomes active

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IPartListener partListener =

 			new IPartListener() {

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(NattablelabelproviderEditor.this);

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(NattablelabelproviderEditor.this);

 

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(NattablelabelproviderEditor.this);

-							handleActivate();

-						}

+						setCurrentViewer(contentOutlineViewer);

 					}

-					else if (p == NattablelabelproviderEditor.this) {

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(NattablelabelproviderEditor.this);

 						handleActivate();

 					}

 				}

-

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

+				else if (p == NattablelabelproviderEditor.this) {

+					handleActivate();

 				}

-

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

 

 	/**

 	 * Resources that have been removed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> removedResources = new ArrayList<Resource>();

@@ -375,7 +350,6 @@ public class NattablelabelproviderEditor
 	 * Resources that have been changed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> changedResources = new ArrayList<Resource>();

@@ -384,7 +358,6 @@ public class NattablelabelproviderEditor
 	 * Resources that have been saved.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> savedResources = new ArrayList<Resource>();

@@ -393,7 +366,6 @@ public class NattablelabelproviderEditor
 	 * Map to store the diagnostic associated with a resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

@@ -402,7 +374,6 @@ public class NattablelabelproviderEditor
 	 * Controls whether the problem indication should be updated.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean updateProblemIndication = true;

@@ -411,19 +382,18 @@ public class NattablelabelproviderEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EContentAdapter problemIndicationAdapter =

 			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

 						case Resource.RESOURCE__IS_LOADED:

 						case Resource.RESOURCE__ERRORS:

 						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

+							Resource resource = (Resource)notification.getNotifier();

 							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

 							if (diagnostic.getSeverity() != Diagnostic.OK) {

 								resourceToDiagnosticMap.put(resource, diagnostic);

@@ -434,136 +404,134 @@ public class NattablelabelproviderEditor
 

 							if (updateProblemIndication) {

 								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											public void run() {

-												updateProblemIndication();

-											}

-										});

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

 							}

 							break;

 						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

 					}

 				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

+				else {

+					super.notifyChanged(notification);

 				}

+			}

 

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

 				}

-			};

+			}

+		};

 

 	/**

 	 * This listens for workspace changes.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IResourceChangeListener resourceChangeListener =

 			new IResourceChangeListener() {

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

 										}

 									}

-									return false;

 								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

+								return false;

 							}

 

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

+							return true;

 						}

 

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(NattablelabelproviderEditor.this, false);

-											}

-										}

-									});

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

 						}

 

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == NattablelabelproviderEditor.this) {

-												handleActivate();

-											}

-										}

-									});

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

 						}

 					}

-					catch (CoreException exception) {

-						NattableEditorPlugin.INSTANCE.log(exception);

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(NattablelabelproviderEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == NattablelabelproviderEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

 					}

 				}

-			};

+				catch (CoreException exception) {

+					NattableEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

 

 	/**

 	 * Handles activation of the editor or it's associated views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleActivate() {

 		// Recompute the read only state.

 		//

 		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

+		  editingDomain.getResourceToReadOnlyMap().clear();

 

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

 		}

 

 		if (!removedResources.isEmpty()) {

@@ -588,7 +556,6 @@ public class NattablelabelproviderEditor
 	 * Handles what to do with changed resources on activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleChangedResources() {

@@ -604,7 +571,8 @@ public class NattablelabelproviderEditor
 					resource.unload();

 					try {

 						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

+					}

+					catch (IOException exception) {

 						if (!resourceToDiagnosticMap.containsKey(resource)) {

 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

@@ -625,17 +593,17 @@ public class NattablelabelproviderEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void updateProblemIndication() {

 		if (updateProblemIndication) {

 			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

 			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

 				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

 					diagnostic.add(childDiagnostic);

@@ -644,7 +612,7 @@ public class NattablelabelproviderEditor
 

 			int lastEditorPage = getPageCount() - 1;

 			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					setActivePage(lastEditorPage);

 				}

@@ -658,7 +626,8 @@ public class NattablelabelproviderEditor
 					setPageText(lastEditorPage, problemEditorPart.getPartName());

 					setActivePage(lastEditorPage);

 					showTabs();

-				} catch (PartInitException exception) {

+				}

+				catch (PartInitException exception) {

 					NattableEditorPlugin.INSTANCE.log(exception);

 				}

 			}

@@ -668,7 +637,8 @@ public class NattablelabelproviderEditor
 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					try {

 						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

+					}

+					catch (CoreException exception) {

 						NattableEditorPlugin.INSTANCE.log(exception);

 					}

 				}

@@ -680,21 +650,20 @@ public class NattablelabelproviderEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

+		return

+			MessageDialog.openQuestion

 				(getSite().getShell(),

-						getString("_UI_FileConflict_label"), //$NON-NLS-1$

-						getString("_WARN_FileConflict")); //$NON-NLS-1$

+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

+				 getString("_WARN_FileConflict")); //$NON-NLS-1$

 	}

 

 	/**

 	 * This creates a model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattablelabelproviderEditor() {

@@ -706,7 +675,6 @@ public class NattablelabelproviderEditor
 	 * This sets up the editing domain for the model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void initializeEditingDomain() {

@@ -735,32 +703,32 @@ public class NattablelabelproviderEditor
 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

 		//

 		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

 

 		// Create the editing domain with a special command stack.

 		//

@@ -771,7 +739,6 @@ public class NattablelabelproviderEditor
 	 * This is here for the listener to be able to call it.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -783,7 +750,6 @@ public class NattablelabelproviderEditor
 	 * This sets the selection into whichever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setSelectionToViewer(Collection<?> collection) {

@@ -792,25 +758,25 @@ public class NattablelabelproviderEditor
 		//

 		if (theSelection != null && !theSelection.isEmpty()) {

 			Runnable runnable =

-					new Runnable() {

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

 						}

-					};

+					}

+				};

 			getSite().getShell().getDisplay().asyncExec(runnable);

 		}

 	}

 

 	/**

 	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -821,14 +787,12 @@ public class NattablelabelproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

@@ -838,11 +802,10 @@ public class NattablelabelproviderEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getElements(Object object) {

+		public Object [] getElements(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -850,11 +813,10 @@ public class NattablelabelproviderEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getChildren(Object object) {

+		public Object [] getChildren(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -862,7 +824,6 @@ public class NattablelabelproviderEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -874,7 +835,6 @@ public class NattablelabelproviderEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -886,7 +846,6 @@ public class NattablelabelproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewerPane(ViewerPane viewerPane) {

@@ -904,7 +863,6 @@ public class NattablelabelproviderEditor
 	 * is the current one.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewer(Viewer viewer) {

@@ -915,13 +873,13 @@ public class NattablelabelproviderEditor
 				// Create the listener on demand.

 				//

 				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

 			}

 

 			// Stop listening to the old one.

@@ -950,7 +908,6 @@ public class NattablelabelproviderEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -962,7 +919,6 @@ public class NattablelabelproviderEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void createContextMenuFor(StructuredViewer viewer) {

@@ -970,7 +926,7 @@ public class NattablelabelproviderEditor
 		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

 		contextMenu.setRemoveAllWhenShown(true);

 		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

 		viewer.getControl().setMenu(menu);

 		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

 

@@ -984,25 +940,25 @@ public class NattablelabelproviderEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

 		Exception exception = null;

 		Resource resource = null;

 		try {

 			// Load the resource through the editing domain.

 			//

 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

+		}

+		catch (Exception e) {

 			exception = e;

 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

 		}

 

 		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

 		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

 		}

 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

 	}

@@ -1012,25 +968,29 @@ public class NattablelabelproviderEditor
 	 * and the specified exception (if any).

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+		boolean hasErrors = !resource.getErrors().isEmpty();

+		if (hasErrors || !resource.getWarnings().isEmpty()) {

 			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-							new Object[] { exception == null ? (Object) resource : exception });

+				new BasicDiagnostic

+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object [] { exception == null ? (Object)resource : exception });

 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

 			return basicDiagnostic;

 		}

 		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					new Object[] { exception });

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object[] { exception });

 		}

 		else {

 			return Diagnostic.OK_INSTANCE;

@@ -1041,7 +1001,6 @@ public class NattablelabelproviderEditor
 	 * This is the method used by the framework to install your own controls.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1057,23 +1016,22 @@ public class NattablelabelproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

 				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 

 				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1092,23 +1050,22 @@ public class NattablelabelproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				parentViewer = (TreeViewer) viewerPane.getViewer();

+				parentViewer = (TreeViewer)viewerPane.getViewer();

 				parentViewer.setAutoExpandLevel(30);

 				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

 				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1122,20 +1079,19 @@ public class NattablelabelproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

+				listViewer = (ListViewer)viewerPane.getViewer();

 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1148,20 +1104,19 @@ public class NattablelabelproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

+				treeViewer = (TreeViewer)viewerPane.getViewer();

 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1176,20 +1131,19 @@ public class NattablelabelproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

+				tableViewer = (TableViewer)viewerPane.getViewer();

 

 				Table table = tableViewer.getTable();

 				TableLayout layout = new TableLayout();

@@ -1207,7 +1161,7 @@ public class NattablelabelproviderEditor
 				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

 				selfColumn.setResizable(true);

 

-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1220,21 +1174,20 @@ public class NattablelabelproviderEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablelabelproviderEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

 

 				Tree tree = treeViewerWithColumns.getTree();

 				tree.setLayoutData(new FillLayout());

@@ -1251,7 +1204,7 @@ public class NattablelabelproviderEditor
 				selfColumn.setResizable(true);

 				selfColumn.setWidth(200);

 

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1261,36 +1214,35 @@ public class NattablelabelproviderEditor
 			}

 

 			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						public void run() {

-							setActivePage(0);

-						}

-					});

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

 		}

 

 		// Ensures that this editor will only display the page's tab

 		// area if there are more than one page

 		//

 		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

 					}

-				});

+				}

+			 });

 

 		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					public void run() {

-						updateProblemIndication();

-					}

-				});

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

 	}

 

 	/**

@@ -1298,14 +1250,13 @@ public class NattablelabelproviderEditor
 	 * this hides the single tab at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void hideTabs() {

 		if (getPageCount() <= 1) {

 			setPageText(0, ""); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

+				((CTabFolder)getContainer()).setTabHeight(1);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y + 6);

 			}

@@ -1317,14 +1268,13 @@ public class NattablelabelproviderEditor
 	 * this shows the tabs at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void showTabs() {

 		if (getPageCount() > 1) {

 			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y - 6);

 			}

@@ -1335,7 +1285,6 @@ public class NattablelabelproviderEditor
 	 * This is used to track the active viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1351,7 +1300,6 @@ public class NattablelabelproviderEditor
 	 * This is how the framework determines which interfaces we implement.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("rawtypes")

@@ -1375,7 +1323,6 @@ public class NattablelabelproviderEditor
 	 * This accesses a cached version of the content outliner.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IContentOutlinePage getContentOutlinePage() {

@@ -1400,9 +1347,9 @@ public class NattablelabelproviderEditor
 					createContextMenuFor(contentOutlineViewer);

 

 					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 					}

 				}

 

@@ -1424,13 +1371,13 @@ public class NattablelabelproviderEditor
 			// Listen to selection so that we can handle it is a special way.

 			//

 			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

 		}

 

 		return contentOutlinePage;

@@ -1440,24 +1387,23 @@ public class NattablelabelproviderEditor
 	 * This accesses a cached version of the property sheet.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

 		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						NattablelabelproviderEditor.this.setSelectionToViewer(selection);

-						NattablelabelproviderEditor.this.setFocus();

-					}

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					NattablelabelproviderEditor.this.setSelectionToViewer(selection);

+					NattablelabelproviderEditor.this.setFocus();

+				}

 

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

 		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

 		propertySheetPages.add(propertySheetPage);

 

@@ -1468,12 +1414,11 @@ public class NattablelabelproviderEditor
 	 * This deals with how we want selection in the outliner to affect the other views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void handleContentOutlineSelection(ISelection selection) {

 		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

 			if (selectedElements.hasNext()) {

 				// Get the first selected element.

 				//

@@ -1508,19 +1453,17 @@ public class NattablelabelproviderEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

 	}

 

 	/**

 	 * This is for implementing {@link IEditorPart} and simply saves the model file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1534,31 +1477,31 @@ public class NattablelabelproviderEditor
 		// Do the work within an operation because this is a long running activity that modifies the workbench.

 		//

 		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

 					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

 								}

-								first = false;

 							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

 						}

 					}

-				};

+				}

+			};

 

 		updateProblemIndication = false;

 		try {

@@ -1568,9 +1511,10 @@ public class NattablelabelproviderEditor
 

 			// Refresh the necessary state.

 			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

 			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			// Something went wrong that shouldn't.

 			//

 			NattableEditorPlugin.INSTANCE.log(exception);

@@ -1584,7 +1528,6 @@ public class NattablelabelproviderEditor
 	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean isPersisted(Resource resource) {

@@ -1595,7 +1538,8 @@ public class NattablelabelproviderEditor
 				result = true;

 				stream.close();

 			}

-		} catch (IOException e) {

+		}

+		catch (IOException e) {

 			// Ignore

 		}

 		return result;

@@ -1605,7 +1549,6 @@ public class NattablelabelproviderEditor
 	 * This always returns true because it is not currently supported.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1617,7 +1560,6 @@ public class NattablelabelproviderEditor
 	 * This also changes the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1636,7 +1578,6 @@ public class NattablelabelproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void doSaveAs(URI uri, IEditorInput editorInput) {

@@ -1644,16 +1585,15 @@ public class NattablelabelproviderEditor
 		setInputWithNotify(editorInput);

 		setPartName(editorInput.getName());

 		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

 		doSave(progressMonitor);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1668,7 +1608,6 @@ public class NattablelabelproviderEditor
 	 * This is called during startup.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1684,7 +1623,6 @@ public class NattablelabelproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1701,7 +1639,6 @@ public class NattablelabelproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1713,7 +1650,6 @@ public class NattablelabelproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1725,7 +1661,6 @@ public class NattablelabelproviderEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1738,7 +1673,6 @@ public class NattablelabelproviderEditor
 	 * Calling this result will notify the listeners.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1754,30 +1688,29 @@ public class NattablelabelproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setStatusLineManager(ISelection selection) {

 		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

 

 		if (statusLineManager != null) {

 			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

 				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-					break;

-				}

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

+						break;

+					}

 				}

 			}

 			else {

@@ -1790,7 +1723,6 @@ public class NattablelabelproviderEditor
 	 * This looks up a string in the plugin's plugin.properties file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key) {

@@ -1801,39 +1733,35 @@ public class NattablelabelproviderEditor
 	 * This looks up a string in plugin.properties, making a substitution.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

 	}

 

 	/**

 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IActionBars getActionBars() {

@@ -1843,7 +1771,6 @@ public class NattablelabelproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AdapterFactory getAdapterFactory() {

@@ -1853,7 +1780,6 @@ public class NattablelabelproviderEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1885,7 +1811,6 @@ public class NattablelabelproviderEditor
 	 * Returns whether the outline view should be presented to the user.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean showOutlineView() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
index f16d42ef359..294d3f5a823 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
@@ -75,7 +75,6 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablelabelproviderModelWizard extends Wizard implements INewWizard {

@@ -83,7 +82,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * The supported extensions for created files.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final List<String> FILE_EXTENSIONS =

@@ -93,7 +91,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * A formatted list of supported file extensions, suitable for display.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final String FORMATTED_FILE_EXTENSIONS =

@@ -103,7 +100,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This caches an instance of the model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablelabelproviderPackage nattablelabelproviderPackage = NattablelabelproviderPackage.eINSTANCE;

@@ -112,7 +108,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This caches an instance of the model factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablelabelproviderFactory nattablelabelproviderFactory = nattablelabelproviderPackage.getNattablelabelproviderFactory();

@@ -121,7 +116,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This is the file creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablelabelproviderModelWizardNewFileCreationPage newFileCreationPage;

@@ -130,7 +124,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This is the initial object creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablelabelproviderModelWizardInitialObjectCreationPage initialObjectCreationPage;

@@ -139,7 +132,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Remember the selection during initialization for populating the default container.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStructuredSelection selection;

@@ -148,7 +140,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Remember the workbench during initialization.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IWorkbench workbench;

@@ -157,7 +148,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Caches the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<String> initialObjectNames;

@@ -166,7 +156,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This just records the information.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -181,7 +170,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Returns the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<String> getInitialObjectNames() {

@@ -189,7 +177,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 			initialObjectNames = new ArrayList<String>();

 			for (EClassifier eClassifier : nattablelabelproviderPackage.getEClassifiers()) {

 				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

+					EClass eClass = (EClass)eClassifier;

 					if (!eClass.isAbstract()) {

 						initialObjectNames.add(eClass.getName());

 					}

@@ -204,11 +192,10 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Create a new model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObject createInitialModel() {

-		EClass eClass = (EClass) nattablelabelproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EClass eClass = (EClass)nattablelabelproviderPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

 		EObject rootObject = nattablelabelproviderFactory.create(eClass);

 		return rootObject;

 	}

@@ -217,7 +204,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Do the work after everything is specified.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -230,43 +216,43 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 			// Do the work within an operation.

 			//

 			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								NattableEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

 							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							NattableEditorPlugin.INSTANCE.log(exception);

 						}

-					};

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

 

 			getContainer().run(false, false, operation);

 

@@ -278,26 +264,28 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 			if (activePart instanceof ISetSelectionTarget) {

 				final ISelection targetSelection = new StructuredSelection(modelFile);

 				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

 			}

 

 			// Open an editor on the new file.

 			//

 			try {

 				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

 				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

 				return false;

 			}

 

 			return true;

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			NattableEditorPlugin.INSTANCE.log(exception);

 			return false;

 		}

@@ -307,7 +295,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This is the one page of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattablelabelproviderModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

@@ -315,7 +302,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattablelabelproviderModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

@@ -326,7 +312,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		 * The framework calls this to see if the file is correct.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -335,7 +320,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 				String extension = new Path(getFileName()).getFileExtension();

 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

 					return false;

 				}

 				return true;

@@ -346,7 +331,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public IFile getModelFile() {

@@ -358,14 +342,12 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * This is the page where the type of object to create is selected.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattablelabelproviderModelWizardInitialObjectCreationPage extends WizardPage {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo initialObjectField;

@@ -380,7 +362,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo encodingField;

@@ -389,7 +370,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattablelabelproviderModelWizardInitialObjectCreationPage(String pageId) {

@@ -399,13 +379,11 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

 		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

+			Composite composite = new Composite(parent, SWT.NONE); {

 				GridLayout layout = new GridLayout();

 				layout.numColumns = 1;

 				layout.verticalSpacing = 12;

@@ -474,20 +452,18 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected ModifyListener validator =

 				new ModifyListener() {

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected boolean validatePage() {

@@ -497,7 +473,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -518,7 +493,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getInitialObjectName() {

@@ -535,7 +509,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getEncoding() {

@@ -546,13 +519,13 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		 * Returns the label for the specified type name.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected String getLabel(String typeName) {

 			try {

 				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (MissingResourceException mre) {

+			}

+			catch(MissingResourceException mre) {

 				NattableEditorPlugin.INSTANCE.log(mre);

 			}

 			return typeName;

@@ -561,13 +534,12 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Collection<String> getEncodings() {

 			if (encodings == null) {

 				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$

+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

 				{

 					encodings.add(stringTokenizer.nextToken());

 				}

@@ -580,7 +552,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * The framework calls this to create the contents of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -602,7 +573,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 			if (selectedElement instanceof IResource) {

 				// Get the resource parent, if its a file.

 				//

-				IResource selectedResource = (IResource) selectedElement;

+				IResource selectedResource = (IResource)selectedElement;

 				if (selectedResource.getType() == IResource.FILE) {

 					selectedResource = selectedResource.getParent();

 				}

@@ -619,7 +590,7 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattablelabelproviderEditorFilenameDefaultBase"); //$NON-NLS-1$

 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

 					}

 					newFileCreationPage.setFileName(modelFilename);

@@ -636,7 +607,6 @@ public class NattablelabelproviderModelWizard extends Wizard implements INewWiza
 	 * Get the file from the page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IFile getModelFile() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
index 77089fe6bd0..d7dcac1123a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemActionBarContributor.java
@@ -49,7 +49,6 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattableproblem model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableproblemActionBarContributor

@@ -59,7 +58,6 @@ public class NattableproblemActionBarContributor
 	 * This keeps track of the active editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IEditorPart activeEditorPart;

@@ -68,7 +66,6 @@ public class NattableproblemActionBarContributor
 	 * This keeps track of the current selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionProvider selectionProvider;

@@ -77,56 +74,53 @@ public class NattableproblemActionBarContributor
 	 * 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);

-					}

+		{

+			@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 boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

 

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

+			@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;

@@ -135,7 +129,6 @@ public class NattableproblemActionBarContributor
 	 * 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;

@@ -145,7 +138,6 @@ public class NattableproblemActionBarContributor
 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createSiblingActions;

@@ -154,7 +146,6 @@ public class NattableproblemActionBarContributor
 	 * 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;

@@ -163,7 +154,6 @@ public class NattableproblemActionBarContributor
 	 * This creates an instance of the contributor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableproblemActionBarContributor() {

@@ -177,7 +167,6 @@ public class NattableproblemActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -191,7 +180,6 @@ public class NattableproblemActionBarContributor
 	 * as well as the sub-menus for object creation items.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -218,11 +206,11 @@ public class NattableproblemActionBarContributor
 		// Force an update because Eclipse hides empty menus now.

 		//

 		submenuManager.addMenuListener

-				(new IMenuListener() {

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

 

 		addGlobalActions(submenuManager);

 	}

@@ -231,7 +219,6 @@ public class NattableproblemActionBarContributor
 	 * 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

@@ -265,7 +252,6 @@ public class NattableproblemActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -285,10 +271,10 @@ public class NattableproblemActionBarContributor
 		Collection<?> newSiblingDescriptors = null;

 

 		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

 

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

 

 			newChildDescriptors = domain.getNewChildDescriptors(object, null);

 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

@@ -314,7 +300,6 @@ public class NattableproblemActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

@@ -332,7 +317,6 @@ public class NattableproblemActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

@@ -352,7 +336,6 @@ public class NattableproblemActionBarContributor
 	 * 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) {

@@ -373,7 +356,6 @@ public class NattableproblemActionBarContributor
 	 * 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) {

@@ -384,13 +366,13 @@ public class NattableproblemActionBarContributor
 				//

 				IContributionItem contributionItem = items[i];

 				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

 				}

 

 				// Delete the ActionContributionItems with matching action.

 				//

 				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

 					if (actions.contains(action)) {

 						manager.remove(contributionItem);

 					}

@@ -403,7 +385,6 @@ public class NattableproblemActionBarContributor
 	 * This populates the pop-up menu before it appears.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -424,7 +405,6 @@ public class NattableproblemActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -432,7 +412,7 @@ public class NattableproblemActionBarContributor
 		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());

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

 		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

 

 		super.addGlobalActions(menuManager);

@@ -442,7 +422,6 @@ public class NattableproblemActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
index 1e84859bb1c..d445b5c3fbe 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemEditor.java
@@ -145,7 +145,6 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattableproblem model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableproblemEditor

@@ -155,7 +154,6 @@ public class NattableproblemEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AdapterFactoryEditingDomain editingDomain;

@@ -164,7 +162,6 @@ public class NattableproblemEditor
 	 * This is the one adapter factory used for providing views of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory adapterFactory;

@@ -173,7 +170,6 @@ public class NattableproblemEditor
 	 * This is the content outline page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IContentOutlinePage contentOutlinePage;

@@ -182,7 +178,6 @@ public class NattableproblemEditor
 	 * This is a kludge...

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStatusLineManager contentOutlineStatusLineManager;

@@ -191,7 +186,6 @@ public class NattableproblemEditor
 	 * This is the content outline page's viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer contentOutlineViewer;

@@ -200,7 +194,6 @@ public class NattableproblemEditor
 	 * This is the property sheet page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

@@ -210,7 +203,6 @@ public class NattableproblemEditor
 	 * The parent relation must be correctly defined for this to work.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer selectionViewer;

@@ -219,7 +211,6 @@ public class NattableproblemEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer parentViewer;

@@ -228,7 +219,6 @@ public class NattableproblemEditor
 	 * This shows how a tree view works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewer;

@@ -238,7 +228,6 @@ public class NattableproblemEditor
 	 * A list viewer doesn't support icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ListViewer listViewer;

@@ -248,7 +237,6 @@ public class NattableproblemEditor
 	 * A table can be used as a list with icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableViewer tableViewer;

@@ -257,7 +245,6 @@ public class NattableproblemEditor
 	 * This shows how a tree view with columns works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewerWithColumns;

@@ -266,7 +253,6 @@ public class NattableproblemEditor
 	 * This keeps track of the active viewer pane, in the book.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ViewerPane currentViewerPane;

@@ -275,7 +261,6 @@ public class NattableproblemEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Viewer currentViewer;

@@ -284,7 +269,6 @@ public class NattableproblemEditor
 	 * This listens to which ever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionChangedListener selectionChangedListener;

@@ -293,7 +277,6 @@ public class NattableproblemEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

@@ -302,7 +285,6 @@ public class NattableproblemEditor
 	 * This keeps track of the selection of the editor as a whole.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelection editorSelection = StructuredSelection.EMPTY;

@@ -312,7 +294,6 @@ public class NattableproblemEditor
 	 * in Eclipse's Problems View.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

@@ -321,52 +302,46 @@ public class NattableproblemEditor
 	 * This listens for when the outline becomes active

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IPartListener partListener =

 			new IPartListener() {

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(NattableproblemEditor.this);

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(NattableproblemEditor.this);

 

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(NattableproblemEditor.this);

-							handleActivate();

-						}

+						setCurrentViewer(contentOutlineViewer);

 					}

-					else if (p == NattableproblemEditor.this) {

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(NattableproblemEditor.this);

 						handleActivate();

 					}

 				}

-

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

+				else if (p == NattableproblemEditor.this) {

+					handleActivate();

 				}

-

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

 

 	/**

 	 * Resources that have been removed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> removedResources = new ArrayList<Resource>();

@@ -375,7 +350,6 @@ public class NattableproblemEditor
 	 * Resources that have been changed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> changedResources = new ArrayList<Resource>();

@@ -384,7 +358,6 @@ public class NattableproblemEditor
 	 * Resources that have been saved.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> savedResources = new ArrayList<Resource>();

@@ -393,7 +366,6 @@ public class NattableproblemEditor
 	 * Map to store the diagnostic associated with a resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

@@ -402,7 +374,6 @@ public class NattableproblemEditor
 	 * Controls whether the problem indication should be updated.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean updateProblemIndication = true;

@@ -411,19 +382,18 @@ public class NattableproblemEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EContentAdapter problemIndicationAdapter =

 			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

 						case Resource.RESOURCE__IS_LOADED:

 						case Resource.RESOURCE__ERRORS:

 						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

+							Resource resource = (Resource)notification.getNotifier();

 							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

 							if (diagnostic.getSeverity() != Diagnostic.OK) {

 								resourceToDiagnosticMap.put(resource, diagnostic);

@@ -434,136 +404,134 @@ public class NattableproblemEditor
 

 							if (updateProblemIndication) {

 								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											public void run() {

-												updateProblemIndication();

-											}

-										});

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

 							}

 							break;

 						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

 					}

 				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

+				else {

+					super.notifyChanged(notification);

 				}

+			}

 

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

 				}

-			};

+			}

+		};

 

 	/**

 	 * This listens for workspace changes.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IResourceChangeListener resourceChangeListener =

 			new IResourceChangeListener() {

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

 										}

 									}

-									return false;

 								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

+								return false;

 							}

 

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

+							return true;

 						}

 

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(NattableproblemEditor.this, false);

-											}

-										}

-									});

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

 						}

 

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == NattableproblemEditor.this) {

-												handleActivate();

-											}

-										}

-									});

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

 						}

 					}

-					catch (CoreException exception) {

-						NattableEditorPlugin.INSTANCE.log(exception);

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(NattableproblemEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == NattableproblemEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

 					}

 				}

-			};

+				catch (CoreException exception) {

+					NattableEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

 

 	/**

 	 * Handles activation of the editor or it's associated views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleActivate() {

 		// Recompute the read only state.

 		//

 		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

+		  editingDomain.getResourceToReadOnlyMap().clear();

 

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

 		}

 

 		if (!removedResources.isEmpty()) {

@@ -588,7 +556,6 @@ public class NattableproblemEditor
 	 * Handles what to do with changed resources on activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleChangedResources() {

@@ -604,7 +571,8 @@ public class NattableproblemEditor
 					resource.unload();

 					try {

 						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

+					}

+					catch (IOException exception) {

 						if (!resourceToDiagnosticMap.containsKey(resource)) {

 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

@@ -625,17 +593,17 @@ public class NattableproblemEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void updateProblemIndication() {

 		if (updateProblemIndication) {

 			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

 			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

 				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

 					diagnostic.add(childDiagnostic);

@@ -644,7 +612,7 @@ public class NattableproblemEditor
 

 			int lastEditorPage = getPageCount() - 1;

 			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					setActivePage(lastEditorPage);

 				}

@@ -658,7 +626,8 @@ public class NattableproblemEditor
 					setPageText(lastEditorPage, problemEditorPart.getPartName());

 					setActivePage(lastEditorPage);

 					showTabs();

-				} catch (PartInitException exception) {

+				}

+				catch (PartInitException exception) {

 					NattableEditorPlugin.INSTANCE.log(exception);

 				}

 			}

@@ -668,7 +637,8 @@ public class NattableproblemEditor
 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					try {

 						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

+					}

+					catch (CoreException exception) {

 						NattableEditorPlugin.INSTANCE.log(exception);

 					}

 				}

@@ -680,21 +650,20 @@ public class NattableproblemEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

+		return

+			MessageDialog.openQuestion

 				(getSite().getShell(),

-						getString("_UI_FileConflict_label"), //$NON-NLS-1$

-						getString("_WARN_FileConflict")); //$NON-NLS-1$

+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

+				 getString("_WARN_FileConflict")); //$NON-NLS-1$

 	}

 

 	/**

 	 * This creates a model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableproblemEditor() {

@@ -706,7 +675,6 @@ public class NattableproblemEditor
 	 * This sets up the editing domain for the model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void initializeEditingDomain() {

@@ -735,32 +703,32 @@ public class NattableproblemEditor
 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

 		//

 		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

 

 		// Create the editing domain with a special command stack.

 		//

@@ -771,7 +739,6 @@ public class NattableproblemEditor
 	 * This is here for the listener to be able to call it.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -783,7 +750,6 @@ public class NattableproblemEditor
 	 * This sets the selection into whichever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setSelectionToViewer(Collection<?> collection) {

@@ -792,25 +758,25 @@ public class NattableproblemEditor
 		//

 		if (theSelection != null && !theSelection.isEmpty()) {

 			Runnable runnable =

-					new Runnable() {

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

 						}

-					};

+					}

+				};

 			getSite().getShell().getDisplay().asyncExec(runnable);

 		}

 	}

 

 	/**

 	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -821,14 +787,12 @@ public class NattableproblemEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

@@ -838,11 +802,10 @@ public class NattableproblemEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getElements(Object object) {

+		public Object [] getElements(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -850,11 +813,10 @@ public class NattableproblemEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getChildren(Object object) {

+		public Object [] getChildren(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -862,7 +824,6 @@ public class NattableproblemEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -874,7 +835,6 @@ public class NattableproblemEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -886,7 +846,6 @@ public class NattableproblemEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewerPane(ViewerPane viewerPane) {

@@ -904,7 +863,6 @@ public class NattableproblemEditor
 	 * is the current one.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewer(Viewer viewer) {

@@ -915,13 +873,13 @@ public class NattableproblemEditor
 				// Create the listener on demand.

 				//

 				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

 			}

 

 			// Stop listening to the old one.

@@ -950,7 +908,6 @@ public class NattableproblemEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -962,7 +919,6 @@ public class NattableproblemEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void createContextMenuFor(StructuredViewer viewer) {

@@ -970,7 +926,7 @@ public class NattableproblemEditor
 		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

 		contextMenu.setRemoveAllWhenShown(true);

 		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

 		viewer.getControl().setMenu(menu);

 		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

 

@@ -984,25 +940,25 @@ public class NattableproblemEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

 		Exception exception = null;

 		Resource resource = null;

 		try {

 			// Load the resource through the editing domain.

 			//

 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

+		}

+		catch (Exception e) {

 			exception = e;

 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

 		}

 

 		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

 		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

 		}

 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

 	}

@@ -1012,25 +968,29 @@ public class NattableproblemEditor
 	 * and the specified exception (if any).

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+		boolean hasErrors = !resource.getErrors().isEmpty();

+		if (hasErrors || !resource.getWarnings().isEmpty()) {

 			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-							new Object[] { exception == null ? (Object) resource : exception });

+				new BasicDiagnostic

+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object [] { exception == null ? (Object)resource : exception });

 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

 			return basicDiagnostic;

 		}

 		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					new Object[] { exception });

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object[] { exception });

 		}

 		else {

 			return Diagnostic.OK_INSTANCE;

@@ -1041,7 +1001,6 @@ public class NattableproblemEditor
 	 * This is the method used by the framework to install your own controls.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1057,23 +1016,22 @@ public class NattableproblemEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

 				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 

 				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1092,23 +1050,22 @@ public class NattableproblemEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				parentViewer = (TreeViewer) viewerPane.getViewer();

+				parentViewer = (TreeViewer)viewerPane.getViewer();

 				parentViewer.setAutoExpandLevel(30);

 				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

 				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1122,20 +1079,19 @@ public class NattableproblemEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

+				listViewer = (ListViewer)viewerPane.getViewer();

 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1148,20 +1104,19 @@ public class NattableproblemEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

+				treeViewer = (TreeViewer)viewerPane.getViewer();

 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1176,20 +1131,19 @@ public class NattableproblemEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

+				tableViewer = (TableViewer)viewerPane.getViewer();

 

 				Table table = tableViewer.getTable();

 				TableLayout layout = new TableLayout();

@@ -1207,7 +1161,7 @@ public class NattableproblemEditor
 				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

 				selfColumn.setResizable(true);

 

-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1220,21 +1174,20 @@ public class NattableproblemEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableproblemEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

 

 				Tree tree = treeViewerWithColumns.getTree();

 				tree.setLayoutData(new FillLayout());

@@ -1251,7 +1204,7 @@ public class NattableproblemEditor
 				selfColumn.setResizable(true);

 				selfColumn.setWidth(200);

 

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1261,36 +1214,35 @@ public class NattableproblemEditor
 			}

 

 			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						public void run() {

-							setActivePage(0);

-						}

-					});

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

 		}

 

 		// Ensures that this editor will only display the page's tab

 		// area if there are more than one page

 		//

 		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

 					}

-				});

+				}

+			 });

 

 		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					public void run() {

-						updateProblemIndication();

-					}

-				});

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

 	}

 

 	/**

@@ -1298,14 +1250,13 @@ public class NattableproblemEditor
 	 * this hides the single tab at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void hideTabs() {

 		if (getPageCount() <= 1) {

 			setPageText(0, ""); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

+				((CTabFolder)getContainer()).setTabHeight(1);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y + 6);

 			}

@@ -1317,14 +1268,13 @@ public class NattableproblemEditor
 	 * this shows the tabs at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void showTabs() {

 		if (getPageCount() > 1) {

 			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y - 6);

 			}

@@ -1335,7 +1285,6 @@ public class NattableproblemEditor
 	 * This is used to track the active viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1351,7 +1300,6 @@ public class NattableproblemEditor
 	 * This is how the framework determines which interfaces we implement.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("rawtypes")

@@ -1375,7 +1323,6 @@ public class NattableproblemEditor
 	 * This accesses a cached version of the content outliner.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IContentOutlinePage getContentOutlinePage() {

@@ -1400,9 +1347,9 @@ public class NattableproblemEditor
 					createContextMenuFor(contentOutlineViewer);

 

 					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 					}

 				}

 

@@ -1424,13 +1371,13 @@ public class NattableproblemEditor
 			// Listen to selection so that we can handle it is a special way.

 			//

 			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

 		}

 

 		return contentOutlinePage;

@@ -1440,24 +1387,23 @@ public class NattableproblemEditor
 	 * This accesses a cached version of the property sheet.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

 		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						NattableproblemEditor.this.setSelectionToViewer(selection);

-						NattableproblemEditor.this.setFocus();

-					}

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					NattableproblemEditor.this.setSelectionToViewer(selection);

+					NattableproblemEditor.this.setFocus();

+				}

 

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

 		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

 		propertySheetPages.add(propertySheetPage);

 

@@ -1468,12 +1414,11 @@ public class NattableproblemEditor
 	 * This deals with how we want selection in the outliner to affect the other views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void handleContentOutlineSelection(ISelection selection) {

 		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

 			if (selectedElements.hasNext()) {

 				// Get the first selected element.

 				//

@@ -1508,19 +1453,17 @@ public class NattableproblemEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

 	}

 

 	/**

 	 * This is for implementing {@link IEditorPart} and simply saves the model file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1534,31 +1477,31 @@ public class NattableproblemEditor
 		// Do the work within an operation because this is a long running activity that modifies the workbench.

 		//

 		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

 					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

 								}

-								first = false;

 							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

 						}

 					}

-				};

+				}

+			};

 

 		updateProblemIndication = false;

 		try {

@@ -1568,9 +1511,10 @@ public class NattableproblemEditor
 

 			// Refresh the necessary state.

 			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

 			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			// Something went wrong that shouldn't.

 			//

 			NattableEditorPlugin.INSTANCE.log(exception);

@@ -1584,7 +1528,6 @@ public class NattableproblemEditor
 	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean isPersisted(Resource resource) {

@@ -1595,7 +1538,8 @@ public class NattableproblemEditor
 				result = true;

 				stream.close();

 			}

-		} catch (IOException e) {

+		}

+		catch (IOException e) {

 			// Ignore

 		}

 		return result;

@@ -1605,7 +1549,6 @@ public class NattableproblemEditor
 	 * This always returns true because it is not currently supported.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1617,7 +1560,6 @@ public class NattableproblemEditor
 	 * This also changes the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1636,7 +1578,6 @@ public class NattableproblemEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void doSaveAs(URI uri, IEditorInput editorInput) {

@@ -1644,16 +1585,15 @@ public class NattableproblemEditor
 		setInputWithNotify(editorInput);

 		setPartName(editorInput.getName());

 		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

 		doSave(progressMonitor);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1668,7 +1608,6 @@ public class NattableproblemEditor
 	 * This is called during startup.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1684,7 +1623,6 @@ public class NattableproblemEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1701,7 +1639,6 @@ public class NattableproblemEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1713,7 +1650,6 @@ public class NattableproblemEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1725,7 +1661,6 @@ public class NattableproblemEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1738,7 +1673,6 @@ public class NattableproblemEditor
 	 * Calling this result will notify the listeners.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1754,30 +1688,29 @@ public class NattableproblemEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setStatusLineManager(ISelection selection) {

 		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

 

 		if (statusLineManager != null) {

 			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

 				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-					break;

-				}

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

+						break;

+					}

 				}

 			}

 			else {

@@ -1790,7 +1723,6 @@ public class NattableproblemEditor
 	 * This looks up a string in the plugin's plugin.properties file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key) {

@@ -1801,39 +1733,35 @@ public class NattableproblemEditor
 	 * This looks up a string in plugin.properties, making a substitution.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

 	}

 

 	/**

 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IActionBars getActionBars() {

@@ -1843,7 +1771,6 @@ public class NattableproblemEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AdapterFactory getAdapterFactory() {

@@ -1853,7 +1780,6 @@ public class NattableproblemEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1885,7 +1811,6 @@ public class NattableproblemEditor
 	 * Returns whether the outline view should be presented to the user.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean showOutlineView() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
index 209a8c27ea6..1679e091236 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/presentation/NattableproblemModelWizard.java
@@ -75,7 +75,6 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableproblemModelWizard extends Wizard implements INewWizard {

@@ -83,7 +82,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final List<String> FILE_EXTENSIONS =

@@ -93,7 +91,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final String FORMATTED_FILE_EXTENSIONS =

@@ -103,7 +100,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableproblemPackage nattableproblemPackage = NattableproblemPackage.eINSTANCE;

@@ -112,7 +108,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableproblemFactory nattableproblemFactory = nattableproblemPackage.getNattableproblemFactory();

@@ -121,7 +116,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableproblemModelWizardNewFileCreationPage newFileCreationPage;

@@ -130,7 +124,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableproblemModelWizardInitialObjectCreationPage initialObjectCreationPage;

@@ -139,7 +132,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStructuredSelection selection;

@@ -148,7 +140,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IWorkbench workbench;

@@ -157,7 +148,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<String> initialObjectNames;

@@ -166,7 +156,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -181,7 +170,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<String> getInitialObjectNames() {

@@ -189,7 +177,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 			initialObjectNames = new ArrayList<String>();

 			for (EClassifier eClassifier : nattableproblemPackage.getEClassifiers()) {

 				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

+					EClass eClass = (EClass)eClassifier;

 					if (!eClass.isAbstract()) {

 						initialObjectNames.add(eClass.getName());

 					}

@@ -204,11 +192,10 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObject createInitialModel() {

-		EClass eClass = (EClass) nattableproblemPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EClass eClass = (EClass)nattableproblemPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

 		EObject rootObject = nattableproblemFactory.create(eClass);

 		return rootObject;

 	}

@@ -217,7 +204,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -230,43 +216,43 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 			// Do the work within an operation.

 			//

 			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								NattableEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

 							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							NattableEditorPlugin.INSTANCE.log(exception);

 						}

-					};

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

 

 			getContainer().run(false, false, operation);

 

@@ -278,26 +264,28 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 			if (activePart instanceof ISetSelectionTarget) {

 				final ISelection targetSelection = new StructuredSelection(modelFile);

 				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

 			}

 

 			// Open an editor on the new file.

 			//

 			try {

 				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

 				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

 				return false;

 			}

 

 			return true;

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			NattableEditorPlugin.INSTANCE.log(exception);

 			return false;

 		}

@@ -307,7 +295,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableproblemModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

@@ -315,7 +302,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableproblemModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

@@ -326,7 +312,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -335,7 +320,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 				String extension = new Path(getFileName()).getFileExtension();

 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

 					return false;

 				}

 				return true;

@@ -346,7 +331,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public IFile getModelFile() {

@@ -358,14 +342,12 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableproblemModelWizardInitialObjectCreationPage extends WizardPage {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo initialObjectField;

@@ -380,7 +362,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo encodingField;

@@ -389,7 +370,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableproblemModelWizardInitialObjectCreationPage(String pageId) {

@@ -399,13 +379,11 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

 		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

+			Composite composite = new Composite(parent, SWT.NONE); {

 				GridLayout layout = new GridLayout();

 				layout.numColumns = 1;

 				layout.verticalSpacing = 12;

@@ -474,20 +452,18 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected ModifyListener validator =

 				new ModifyListener() {

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected boolean validatePage() {

@@ -497,7 +473,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -518,7 +493,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getInitialObjectName() {

@@ -535,7 +509,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getEncoding() {

@@ -546,13 +519,13 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected String getLabel(String typeName) {

 			try {

 				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (MissingResourceException mre) {

+			}

+			catch(MissingResourceException mre) {

 				NattableEditorPlugin.INSTANCE.log(mre);

 			}

 			return typeName;

@@ -561,13 +534,12 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Collection<String> getEncodings() {

 			if (encodings == null) {

 				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$

+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

 				{

 					encodings.add(stringTokenizer.nextToken());

 				}

@@ -580,7 +552,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -602,7 +573,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 			if (selectedElement instanceof IResource) {

 				// Get the resource parent, if its a file.

 				//

-				IResource selectedResource = (IResource) selectedElement;

+				IResource selectedResource = (IResource)selectedElement;

 				if (selectedResource.getType() == IResource.FILE) {

 					selectedResource = selectedResource.getParent();

 				}

@@ -619,7 +590,7 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableproblemEditorFilenameDefaultBase"); //$NON-NLS-1$

 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

 					}

 					newFileCreationPage.setFileName(modelFilename);

@@ -636,7 +607,6 @@ public class NattableproblemModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IFile getModelFile() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
index cd23123f36e..6774fc1abaf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleActionBarContributor.java
@@ -49,7 +49,6 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattablestyle model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablestyleActionBarContributor

@@ -59,7 +58,6 @@ public class NattablestyleActionBarContributor
 	 * This keeps track of the active editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IEditorPart activeEditorPart;

@@ -68,7 +66,6 @@ public class NattablestyleActionBarContributor
 	 * This keeps track of the current selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionProvider selectionProvider;

@@ -77,56 +74,53 @@ public class NattablestyleActionBarContributor
 	 * 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);

-					}

+		{

+			@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 boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

 

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

+			@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;

@@ -135,7 +129,6 @@ public class NattablestyleActionBarContributor
 	 * 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;

@@ -145,7 +138,6 @@ public class NattablestyleActionBarContributor
 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createSiblingActions;

@@ -154,7 +146,6 @@ public class NattablestyleActionBarContributor
 	 * 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;

@@ -163,7 +154,6 @@ public class NattablestyleActionBarContributor
 	 * This creates an instance of the contributor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattablestyleActionBarContributor() {

@@ -177,7 +167,6 @@ public class NattablestyleActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -191,7 +180,6 @@ public class NattablestyleActionBarContributor
 	 * as well as the sub-menus for object creation items.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -218,11 +206,11 @@ public class NattablestyleActionBarContributor
 		// Force an update because Eclipse hides empty menus now.

 		//

 		submenuManager.addMenuListener

-				(new IMenuListener() {

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

 

 		addGlobalActions(submenuManager);

 	}

@@ -231,7 +219,6 @@ public class NattablestyleActionBarContributor
 	 * 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

@@ -265,7 +252,6 @@ public class NattablestyleActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -285,10 +271,10 @@ public class NattablestyleActionBarContributor
 		Collection<?> newSiblingDescriptors = null;

 

 		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

 

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

 

 			newChildDescriptors = domain.getNewChildDescriptors(object, null);

 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

@@ -314,7 +300,6 @@ public class NattablestyleActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

@@ -332,7 +317,6 @@ public class NattablestyleActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

@@ -352,7 +336,6 @@ public class NattablestyleActionBarContributor
 	 * 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) {

@@ -373,7 +356,6 @@ public class NattablestyleActionBarContributor
 	 * 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) {

@@ -384,13 +366,13 @@ public class NattablestyleActionBarContributor
 				//

 				IContributionItem contributionItem = items[i];

 				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

 				}

 

 				// Delete the ActionContributionItems with matching action.

 				//

 				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

 					if (actions.contains(action)) {

 						manager.remove(contributionItem);

 					}

@@ -403,7 +385,6 @@ public class NattablestyleActionBarContributor
 	 * This populates the pop-up menu before it appears.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -424,7 +405,6 @@ public class NattablestyleActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -432,7 +412,7 @@ public class NattablestyleActionBarContributor
 		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());

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

 		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

 

 		super.addGlobalActions(menuManager);

@@ -442,7 +422,6 @@ public class NattablestyleActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
index 135a4409fe5..a924ebc5845 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleEditor.java
@@ -145,7 +145,6 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattablestyle model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablestyleEditor

@@ -155,7 +154,6 @@ public class NattablestyleEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AdapterFactoryEditingDomain editingDomain;

@@ -164,7 +162,6 @@ public class NattablestyleEditor
 	 * This is the one adapter factory used for providing views of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory adapterFactory;

@@ -173,7 +170,6 @@ public class NattablestyleEditor
 	 * This is the content outline page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IContentOutlinePage contentOutlinePage;

@@ -182,7 +178,6 @@ public class NattablestyleEditor
 	 * This is a kludge...

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStatusLineManager contentOutlineStatusLineManager;

@@ -191,7 +186,6 @@ public class NattablestyleEditor
 	 * This is the content outline page's viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer contentOutlineViewer;

@@ -200,7 +194,6 @@ public class NattablestyleEditor
 	 * This is the property sheet page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

@@ -210,7 +203,6 @@ public class NattablestyleEditor
 	 * The parent relation must be correctly defined for this to work.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer selectionViewer;

@@ -219,7 +211,6 @@ public class NattablestyleEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer parentViewer;

@@ -228,7 +219,6 @@ public class NattablestyleEditor
 	 * This shows how a tree view works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewer;

@@ -238,7 +228,6 @@ public class NattablestyleEditor
 	 * A list viewer doesn't support icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ListViewer listViewer;

@@ -248,7 +237,6 @@ public class NattablestyleEditor
 	 * A table can be used as a list with icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableViewer tableViewer;

@@ -257,7 +245,6 @@ public class NattablestyleEditor
 	 * This shows how a tree view with columns works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewerWithColumns;

@@ -266,7 +253,6 @@ public class NattablestyleEditor
 	 * This keeps track of the active viewer pane, in the book.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ViewerPane currentViewerPane;

@@ -275,7 +261,6 @@ public class NattablestyleEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Viewer currentViewer;

@@ -284,7 +269,6 @@ public class NattablestyleEditor
 	 * This listens to which ever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionChangedListener selectionChangedListener;

@@ -293,7 +277,6 @@ public class NattablestyleEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

@@ -302,7 +285,6 @@ public class NattablestyleEditor
 	 * This keeps track of the selection of the editor as a whole.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelection editorSelection = StructuredSelection.EMPTY;

@@ -312,7 +294,6 @@ public class NattablestyleEditor
 	 * in Eclipse's Problems View.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

@@ -321,52 +302,46 @@ public class NattablestyleEditor
 	 * This listens for when the outline becomes active

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IPartListener partListener =

 			new IPartListener() {

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(NattablestyleEditor.this);

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(NattablestyleEditor.this);

 

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(NattablestyleEditor.this);

-							handleActivate();

-						}

+						setCurrentViewer(contentOutlineViewer);

 					}

-					else if (p == NattablestyleEditor.this) {

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(NattablestyleEditor.this);

 						handleActivate();

 					}

 				}

-

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

+				else if (p == NattablestyleEditor.this) {

+					handleActivate();

 				}

-

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

 

 	/**

 	 * Resources that have been removed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> removedResources = new ArrayList<Resource>();

@@ -375,7 +350,6 @@ public class NattablestyleEditor
 	 * Resources that have been changed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> changedResources = new ArrayList<Resource>();

@@ -384,7 +358,6 @@ public class NattablestyleEditor
 	 * Resources that have been saved.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> savedResources = new ArrayList<Resource>();

@@ -393,7 +366,6 @@ public class NattablestyleEditor
 	 * Map to store the diagnostic associated with a resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

@@ -402,7 +374,6 @@ public class NattablestyleEditor
 	 * Controls whether the problem indication should be updated.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean updateProblemIndication = true;

@@ -411,19 +382,18 @@ public class NattablestyleEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EContentAdapter problemIndicationAdapter =

 			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

 						case Resource.RESOURCE__IS_LOADED:

 						case Resource.RESOURCE__ERRORS:

 						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

+							Resource resource = (Resource)notification.getNotifier();

 							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

 							if (diagnostic.getSeverity() != Diagnostic.OK) {

 								resourceToDiagnosticMap.put(resource, diagnostic);

@@ -434,136 +404,134 @@ public class NattablestyleEditor
 

 							if (updateProblemIndication) {

 								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											public void run() {

-												updateProblemIndication();

-											}

-										});

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

 							}

 							break;

 						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

 					}

 				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

+				else {

+					super.notifyChanged(notification);

 				}

+			}

 

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

 				}

-			};

+			}

+		};

 

 	/**

 	 * This listens for workspace changes.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IResourceChangeListener resourceChangeListener =

 			new IResourceChangeListener() {

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

 										}

 									}

-									return false;

 								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

+								return false;

 							}

 

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

+							return true;

 						}

 

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(NattablestyleEditor.this, false);

-											}

-										}

-									});

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

 						}

 

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == NattablestyleEditor.this) {

-												handleActivate();

-											}

-										}

-									});

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

 						}

 					}

-					catch (CoreException exception) {

-						NattableEditorPlugin.INSTANCE.log(exception);

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(NattablestyleEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == NattablestyleEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

 					}

 				}

-			};

+				catch (CoreException exception) {

+					NattableEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

 

 	/**

 	 * Handles activation of the editor or it's associated views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleActivate() {

 		// Recompute the read only state.

 		//

 		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

+		  editingDomain.getResourceToReadOnlyMap().clear();

 

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

 		}

 

 		if (!removedResources.isEmpty()) {

@@ -588,7 +556,6 @@ public class NattablestyleEditor
 	 * Handles what to do with changed resources on activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleChangedResources() {

@@ -604,7 +571,8 @@ public class NattablestyleEditor
 					resource.unload();

 					try {

 						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

+					}

+					catch (IOException exception) {

 						if (!resourceToDiagnosticMap.containsKey(resource)) {

 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

@@ -625,17 +593,17 @@ public class NattablestyleEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void updateProblemIndication() {

 		if (updateProblemIndication) {

 			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

 			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

 				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

 					diagnostic.add(childDiagnostic);

@@ -644,7 +612,7 @@ public class NattablestyleEditor
 

 			int lastEditorPage = getPageCount() - 1;

 			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					setActivePage(lastEditorPage);

 				}

@@ -658,7 +626,8 @@ public class NattablestyleEditor
 					setPageText(lastEditorPage, problemEditorPart.getPartName());

 					setActivePage(lastEditorPage);

 					showTabs();

-				} catch (PartInitException exception) {

+				}

+				catch (PartInitException exception) {

 					NattableEditorPlugin.INSTANCE.log(exception);

 				}

 			}

@@ -668,7 +637,8 @@ public class NattablestyleEditor
 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					try {

 						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

+					}

+					catch (CoreException exception) {

 						NattableEditorPlugin.INSTANCE.log(exception);

 					}

 				}

@@ -680,21 +650,20 @@ public class NattablestyleEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

+		return

+			MessageDialog.openQuestion

 				(getSite().getShell(),

-						getString("_UI_FileConflict_label"), //$NON-NLS-1$

-						getString("_WARN_FileConflict")); //$NON-NLS-1$

+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

+				 getString("_WARN_FileConflict")); //$NON-NLS-1$

 	}

 

 	/**

 	 * This creates a model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattablestyleEditor() {

@@ -706,7 +675,6 @@ public class NattablestyleEditor
 	 * This sets up the editing domain for the model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void initializeEditingDomain() {

@@ -735,32 +703,32 @@ public class NattablestyleEditor
 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

 		//

 		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

 

 		// Create the editing domain with a special command stack.

 		//

@@ -771,7 +739,6 @@ public class NattablestyleEditor
 	 * This is here for the listener to be able to call it.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -783,7 +750,6 @@ public class NattablestyleEditor
 	 * This sets the selection into whichever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setSelectionToViewer(Collection<?> collection) {

@@ -792,25 +758,25 @@ public class NattablestyleEditor
 		//

 		if (theSelection != null && !theSelection.isEmpty()) {

 			Runnable runnable =

-					new Runnable() {

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

 						}

-					};

+					}

+				};

 			getSite().getShell().getDisplay().asyncExec(runnable);

 		}

 	}

 

 	/**

 	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -821,14 +787,12 @@ public class NattablestyleEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

@@ -838,11 +802,10 @@ public class NattablestyleEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getElements(Object object) {

+		public Object [] getElements(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -850,11 +813,10 @@ public class NattablestyleEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getChildren(Object object) {

+		public Object [] getChildren(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -862,7 +824,6 @@ public class NattablestyleEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -874,7 +835,6 @@ public class NattablestyleEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -886,7 +846,6 @@ public class NattablestyleEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewerPane(ViewerPane viewerPane) {

@@ -904,7 +863,6 @@ public class NattablestyleEditor
 	 * is the current one.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewer(Viewer viewer) {

@@ -915,13 +873,13 @@ public class NattablestyleEditor
 				// Create the listener on demand.

 				//

 				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

 			}

 

 			// Stop listening to the old one.

@@ -950,7 +908,6 @@ public class NattablestyleEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -962,7 +919,6 @@ public class NattablestyleEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void createContextMenuFor(StructuredViewer viewer) {

@@ -970,7 +926,7 @@ public class NattablestyleEditor
 		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

 		contextMenu.setRemoveAllWhenShown(true);

 		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

 		viewer.getControl().setMenu(menu);

 		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

 

@@ -984,25 +940,25 @@ public class NattablestyleEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

 		Exception exception = null;

 		Resource resource = null;

 		try {

 			// Load the resource through the editing domain.

 			//

 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

+		}

+		catch (Exception e) {

 			exception = e;

 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

 		}

 

 		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

 		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

 		}

 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

 	}

@@ -1012,25 +968,29 @@ public class NattablestyleEditor
 	 * and the specified exception (if any).

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+		boolean hasErrors = !resource.getErrors().isEmpty();

+		if (hasErrors || !resource.getWarnings().isEmpty()) {

 			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-							new Object[] { exception == null ? (Object) resource : exception });

+				new BasicDiagnostic

+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object [] { exception == null ? (Object)resource : exception });

 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

 			return basicDiagnostic;

 		}

 		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					new Object[] { exception });

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object[] { exception });

 		}

 		else {

 			return Diagnostic.OK_INSTANCE;

@@ -1041,7 +1001,6 @@ public class NattablestyleEditor
 	 * This is the method used by the framework to install your own controls.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1057,23 +1016,22 @@ public class NattablestyleEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

 				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 

 				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1092,23 +1050,22 @@ public class NattablestyleEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				parentViewer = (TreeViewer) viewerPane.getViewer();

+				parentViewer = (TreeViewer)viewerPane.getViewer();

 				parentViewer.setAutoExpandLevel(30);

 				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

 				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1122,20 +1079,19 @@ public class NattablestyleEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

+				listViewer = (ListViewer)viewerPane.getViewer();

 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1148,20 +1104,19 @@ public class NattablestyleEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

+				treeViewer = (TreeViewer)viewerPane.getViewer();

 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1176,20 +1131,19 @@ public class NattablestyleEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

+				tableViewer = (TableViewer)viewerPane.getViewer();

 

 				Table table = tableViewer.getTable();

 				TableLayout layout = new TableLayout();

@@ -1207,7 +1161,7 @@ public class NattablestyleEditor
 				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

 				selfColumn.setResizable(true);

 

-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1220,21 +1174,20 @@ public class NattablestyleEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattablestyleEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

 

 				Tree tree = treeViewerWithColumns.getTree();

 				tree.setLayoutData(new FillLayout());

@@ -1251,7 +1204,7 @@ public class NattablestyleEditor
 				selfColumn.setResizable(true);

 				selfColumn.setWidth(200);

 

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1261,36 +1214,35 @@ public class NattablestyleEditor
 			}

 

 			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						public void run() {

-							setActivePage(0);

-						}

-					});

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

 		}

 

 		// Ensures that this editor will only display the page's tab

 		// area if there are more than one page

 		//

 		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

 					}

-				});

+				}

+			 });

 

 		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					public void run() {

-						updateProblemIndication();

-					}

-				});

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

 	}

 

 	/**

@@ -1298,14 +1250,13 @@ public class NattablestyleEditor
 	 * this hides the single tab at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void hideTabs() {

 		if (getPageCount() <= 1) {

 			setPageText(0, ""); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

+				((CTabFolder)getContainer()).setTabHeight(1);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y + 6);

 			}

@@ -1317,14 +1268,13 @@ public class NattablestyleEditor
 	 * this shows the tabs at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void showTabs() {

 		if (getPageCount() > 1) {

 			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y - 6);

 			}

@@ -1335,7 +1285,6 @@ public class NattablestyleEditor
 	 * This is used to track the active viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1351,7 +1300,6 @@ public class NattablestyleEditor
 	 * This is how the framework determines which interfaces we implement.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("rawtypes")

@@ -1375,7 +1323,6 @@ public class NattablestyleEditor
 	 * This accesses a cached version of the content outliner.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IContentOutlinePage getContentOutlinePage() {

@@ -1400,9 +1347,9 @@ public class NattablestyleEditor
 					createContextMenuFor(contentOutlineViewer);

 

 					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 					}

 				}

 

@@ -1424,13 +1371,13 @@ public class NattablestyleEditor
 			// Listen to selection so that we can handle it is a special way.

 			//

 			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

 		}

 

 		return contentOutlinePage;

@@ -1440,24 +1387,23 @@ public class NattablestyleEditor
 	 * This accesses a cached version of the property sheet.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

 		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						NattablestyleEditor.this.setSelectionToViewer(selection);

-						NattablestyleEditor.this.setFocus();

-					}

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					NattablestyleEditor.this.setSelectionToViewer(selection);

+					NattablestyleEditor.this.setFocus();

+				}

 

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

 		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

 		propertySheetPages.add(propertySheetPage);

 

@@ -1468,12 +1414,11 @@ public class NattablestyleEditor
 	 * This deals with how we want selection in the outliner to affect the other views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void handleContentOutlineSelection(ISelection selection) {

 		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

 			if (selectedElements.hasNext()) {

 				// Get the first selected element.

 				//

@@ -1508,19 +1453,17 @@ public class NattablestyleEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

 	}

 

 	/**

 	 * This is for implementing {@link IEditorPart} and simply saves the model file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1534,31 +1477,31 @@ public class NattablestyleEditor
 		// Do the work within an operation because this is a long running activity that modifies the workbench.

 		//

 		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

 					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

 								}

-								first = false;

 							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

 						}

 					}

-				};

+				}

+			};

 

 		updateProblemIndication = false;

 		try {

@@ -1568,9 +1511,10 @@ public class NattablestyleEditor
 

 			// Refresh the necessary state.

 			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

 			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			// Something went wrong that shouldn't.

 			//

 			NattableEditorPlugin.INSTANCE.log(exception);

@@ -1584,7 +1528,6 @@ public class NattablestyleEditor
 	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean isPersisted(Resource resource) {

@@ -1595,7 +1538,8 @@ public class NattablestyleEditor
 				result = true;

 				stream.close();

 			}

-		} catch (IOException e) {

+		}

+		catch (IOException e) {

 			// Ignore

 		}

 		return result;

@@ -1605,7 +1549,6 @@ public class NattablestyleEditor
 	 * This always returns true because it is not currently supported.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1617,7 +1560,6 @@ public class NattablestyleEditor
 	 * This also changes the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1636,7 +1578,6 @@ public class NattablestyleEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void doSaveAs(URI uri, IEditorInput editorInput) {

@@ -1644,16 +1585,15 @@ public class NattablestyleEditor
 		setInputWithNotify(editorInput);

 		setPartName(editorInput.getName());

 		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

 		doSave(progressMonitor);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1668,7 +1608,6 @@ public class NattablestyleEditor
 	 * This is called during startup.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1684,7 +1623,6 @@ public class NattablestyleEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1701,7 +1639,6 @@ public class NattablestyleEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1713,7 +1650,6 @@ public class NattablestyleEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1725,7 +1661,6 @@ public class NattablestyleEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1738,7 +1673,6 @@ public class NattablestyleEditor
 	 * Calling this result will notify the listeners.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1754,30 +1688,29 @@ public class NattablestyleEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setStatusLineManager(ISelection selection) {

 		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

 

 		if (statusLineManager != null) {

 			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

 				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-					break;

-				}

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

+						break;

+					}

 				}

 			}

 			else {

@@ -1790,7 +1723,6 @@ public class NattablestyleEditor
 	 * This looks up a string in the plugin's plugin.properties file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key) {

@@ -1801,39 +1733,35 @@ public class NattablestyleEditor
 	 * This looks up a string in plugin.properties, making a substitution.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

 	}

 

 	/**

 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IActionBars getActionBars() {

@@ -1843,7 +1771,6 @@ public class NattablestyleEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AdapterFactory getAdapterFactory() {

@@ -1853,7 +1780,6 @@ public class NattablestyleEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1885,7 +1811,6 @@ public class NattablestyleEditor
 	 * Returns whether the outline view should be presented to the user.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean showOutlineView() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
index 8bf68bce092..c1f00961dac 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/presentation/NattablestyleModelWizard.java
@@ -75,7 +75,6 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattablestyleModelWizard extends Wizard implements INewWizard {

@@ -83,7 +82,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final List<String> FILE_EXTENSIONS =

@@ -93,7 +91,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final String FORMATTED_FILE_EXTENSIONS =

@@ -103,7 +100,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablestylePackage nattablestylePackage = NattablestylePackage.eINSTANCE;

@@ -112,7 +108,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablestyleFactory nattablestyleFactory = nattablestylePackage.getNattablestyleFactory();

@@ -121,7 +116,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablestyleModelWizardNewFileCreationPage newFileCreationPage;

@@ -130,7 +124,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablestyleModelWizardInitialObjectCreationPage initialObjectCreationPage;

@@ -139,7 +132,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStructuredSelection selection;

@@ -148,7 +140,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IWorkbench workbench;

@@ -157,7 +148,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<String> initialObjectNames;

@@ -166,7 +156,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -181,7 +170,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<String> getInitialObjectNames() {

@@ -189,7 +177,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 			initialObjectNames = new ArrayList<String>();

 			for (EClassifier eClassifier : nattablestylePackage.getEClassifiers()) {

 				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

+					EClass eClass = (EClass)eClassifier;

 					if (!eClass.isAbstract()) {

 						initialObjectNames.add(eClass.getName());

 					}

@@ -204,11 +192,10 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObject createInitialModel() {

-		EClass eClass = (EClass) nattablestylePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EClass eClass = (EClass)nattablestylePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

 		EObject rootObject = nattablestyleFactory.create(eClass);

 		return rootObject;

 	}

@@ -217,7 +204,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -230,43 +216,43 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 			// Do the work within an operation.

 			//

 			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								NattableEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

 							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							NattableEditorPlugin.INSTANCE.log(exception);

 						}

-					};

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

 

 			getContainer().run(false, false, operation);

 

@@ -278,26 +264,28 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 			if (activePart instanceof ISetSelectionTarget) {

 				final ISelection targetSelection = new StructuredSelection(modelFile);

 				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

 			}

 

 			// Open an editor on the new file.

 			//

 			try {

 				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

 				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

 				return false;

 			}

 

 			return true;

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			NattableEditorPlugin.INSTANCE.log(exception);

 			return false;

 		}

@@ -307,7 +295,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattablestyleModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

@@ -315,7 +302,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattablestyleModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

@@ -326,7 +312,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -335,7 +320,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 				String extension = new Path(getFileName()).getFileExtension();

 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

 					return false;

 				}

 				return true;

@@ -346,7 +331,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public IFile getModelFile() {

@@ -358,14 +342,12 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattablestyleModelWizardInitialObjectCreationPage extends WizardPage {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo initialObjectField;

@@ -380,7 +362,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo encodingField;

@@ -389,7 +370,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattablestyleModelWizardInitialObjectCreationPage(String pageId) {

@@ -399,13 +379,11 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

 		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

+			Composite composite = new Composite(parent, SWT.NONE); {

 				GridLayout layout = new GridLayout();

 				layout.numColumns = 1;

 				layout.verticalSpacing = 12;

@@ -474,20 +452,18 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected ModifyListener validator =

 				new ModifyListener() {

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected boolean validatePage() {

@@ -497,7 +473,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -518,7 +493,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getInitialObjectName() {

@@ -535,7 +509,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getEncoding() {

@@ -546,13 +519,13 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected String getLabel(String typeName) {

 			try {

 				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (MissingResourceException mre) {

+			}

+			catch(MissingResourceException mre) {

 				NattableEditorPlugin.INSTANCE.log(mre);

 			}

 			return typeName;

@@ -561,13 +534,12 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Collection<String> getEncodings() {

 			if (encodings == null) {

 				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$

+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

 				{

 					encodings.add(stringTokenizer.nextToken());

 				}

@@ -580,7 +552,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -602,7 +573,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 			if (selectedElement instanceof IResource) {

 				// Get the resource parent, if its a file.

 				//

-				IResource selectedResource = (IResource) selectedElement;

+				IResource selectedResource = (IResource)selectedElement;

 				if (selectedResource.getType() == IResource.FILE) {

 					selectedResource = selectedResource.getParent();

 				}

@@ -619,7 +590,7 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattablestyleEditorFilenameDefaultBase"); //$NON-NLS-1$

 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

 					}

 					newFileCreationPage.setFileName(modelFilename);

@@ -636,7 +607,6 @@ public class NattablestyleModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IFile getModelFile() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
index 8f07f676a1a..28ab49eac3f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
@@ -49,7 +49,6 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattabletester model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattabletesterActionBarContributor

@@ -59,7 +58,6 @@ public class NattabletesterActionBarContributor
 	 * This keeps track of the active editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IEditorPart activeEditorPart;

@@ -68,7 +66,6 @@ public class NattabletesterActionBarContributor
 	 * This keeps track of the current selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionProvider selectionProvider;

@@ -77,56 +74,53 @@ public class NattabletesterActionBarContributor
 	 * 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);

-					}

+		{

+			@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 boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

 

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

+			@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;

@@ -135,7 +129,6 @@ public class NattabletesterActionBarContributor
 	 * 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;

@@ -145,7 +138,6 @@ public class NattabletesterActionBarContributor
 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createSiblingActions;

@@ -154,7 +146,6 @@ public class NattabletesterActionBarContributor
 	 * 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;

@@ -163,7 +154,6 @@ public class NattabletesterActionBarContributor
 	 * This creates an instance of the contributor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattabletesterActionBarContributor() {

@@ -177,7 +167,6 @@ public class NattabletesterActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -191,7 +180,6 @@ public class NattabletesterActionBarContributor
 	 * as well as the sub-menus for object creation items.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -218,11 +206,11 @@ public class NattabletesterActionBarContributor
 		// Force an update because Eclipse hides empty menus now.

 		//

 		submenuManager.addMenuListener

-				(new IMenuListener() {

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

 

 		addGlobalActions(submenuManager);

 	}

@@ -231,7 +219,6 @@ public class NattabletesterActionBarContributor
 	 * 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

@@ -265,7 +252,6 @@ public class NattabletesterActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -285,10 +271,10 @@ public class NattabletesterActionBarContributor
 		Collection<?> newSiblingDescriptors = null;

 

 		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

 

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

 

 			newChildDescriptors = domain.getNewChildDescriptors(object, null);

 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

@@ -314,7 +300,6 @@ public class NattabletesterActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

@@ -332,7 +317,6 @@ public class NattabletesterActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

@@ -352,7 +336,6 @@ public class NattabletesterActionBarContributor
 	 * 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) {

@@ -373,7 +356,6 @@ public class NattabletesterActionBarContributor
 	 * 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) {

@@ -384,13 +366,13 @@ public class NattabletesterActionBarContributor
 				//

 				IContributionItem contributionItem = items[i];

 				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

 				}

 

 				// Delete the ActionContributionItems with matching action.

 				//

 				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

 					if (actions.contains(action)) {

 						manager.remove(contributionItem);

 					}

@@ -403,7 +385,6 @@ public class NattabletesterActionBarContributor
 	 * This populates the pop-up menu before it appears.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -424,7 +405,6 @@ public class NattabletesterActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -432,7 +412,7 @@ public class NattabletesterActionBarContributor
 		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());

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

 		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

 

 		super.addGlobalActions(menuManager);

@@ -442,7 +422,6 @@ public class NattabletesterActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
index fe940a57096..d548ee87c44 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
@@ -145,7 +145,6 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattabletester model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattabletesterEditor

@@ -155,7 +154,6 @@ public class NattabletesterEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AdapterFactoryEditingDomain editingDomain;

@@ -164,7 +162,6 @@ public class NattabletesterEditor
 	 * This is the one adapter factory used for providing views of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory adapterFactory;

@@ -173,7 +170,6 @@ public class NattabletesterEditor
 	 * This is the content outline page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IContentOutlinePage contentOutlinePage;

@@ -182,7 +178,6 @@ public class NattabletesterEditor
 	 * This is a kludge...

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStatusLineManager contentOutlineStatusLineManager;

@@ -191,7 +186,6 @@ public class NattabletesterEditor
 	 * This is the content outline page's viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer contentOutlineViewer;

@@ -200,7 +194,6 @@ public class NattabletesterEditor
 	 * This is the property sheet page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

@@ -210,7 +203,6 @@ public class NattabletesterEditor
 	 * The parent relation must be correctly defined for this to work.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer selectionViewer;

@@ -219,7 +211,6 @@ public class NattabletesterEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer parentViewer;

@@ -228,7 +219,6 @@ public class NattabletesterEditor
 	 * This shows how a tree view works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewer;

@@ -238,7 +228,6 @@ public class NattabletesterEditor
 	 * A list viewer doesn't support icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ListViewer listViewer;

@@ -248,7 +237,6 @@ public class NattabletesterEditor
 	 * A table can be used as a list with icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableViewer tableViewer;

@@ -257,7 +245,6 @@ public class NattabletesterEditor
 	 * This shows how a tree view with columns works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewerWithColumns;

@@ -266,7 +253,6 @@ public class NattabletesterEditor
 	 * This keeps track of the active viewer pane, in the book.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ViewerPane currentViewerPane;

@@ -275,7 +261,6 @@ public class NattabletesterEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Viewer currentViewer;

@@ -284,7 +269,6 @@ public class NattabletesterEditor
 	 * This listens to which ever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionChangedListener selectionChangedListener;

@@ -293,7 +277,6 @@ public class NattabletesterEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

@@ -302,7 +285,6 @@ public class NattabletesterEditor
 	 * This keeps track of the selection of the editor as a whole.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelection editorSelection = StructuredSelection.EMPTY;

@@ -312,7 +294,6 @@ public class NattabletesterEditor
 	 * in Eclipse's Problems View.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

@@ -321,52 +302,46 @@ public class NattabletesterEditor
 	 * This listens for when the outline becomes active

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IPartListener partListener =

 			new IPartListener() {

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(NattabletesterEditor.this);

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(NattabletesterEditor.this);

 

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(NattabletesterEditor.this);

-							handleActivate();

-						}

+						setCurrentViewer(contentOutlineViewer);

 					}

-					else if (p == NattabletesterEditor.this) {

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(NattabletesterEditor.this);

 						handleActivate();

 					}

 				}

-

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

+				else if (p == NattabletesterEditor.this) {

+					handleActivate();

 				}

-

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

 

 	/**

 	 * Resources that have been removed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> removedResources = new ArrayList<Resource>();

@@ -375,7 +350,6 @@ public class NattabletesterEditor
 	 * Resources that have been changed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> changedResources = new ArrayList<Resource>();

@@ -384,7 +358,6 @@ public class NattabletesterEditor
 	 * Resources that have been saved.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> savedResources = new ArrayList<Resource>();

@@ -393,7 +366,6 @@ public class NattabletesterEditor
 	 * Map to store the diagnostic associated with a resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

@@ -402,7 +374,6 @@ public class NattabletesterEditor
 	 * Controls whether the problem indication should be updated.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean updateProblemIndication = true;

@@ -411,19 +382,18 @@ public class NattabletesterEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EContentAdapter problemIndicationAdapter =

 			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

 						case Resource.RESOURCE__IS_LOADED:

 						case Resource.RESOURCE__ERRORS:

 						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

+							Resource resource = (Resource)notification.getNotifier();

 							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

 							if (diagnostic.getSeverity() != Diagnostic.OK) {

 								resourceToDiagnosticMap.put(resource, diagnostic);

@@ -434,136 +404,134 @@ public class NattabletesterEditor
 

 							if (updateProblemIndication) {

 								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											public void run() {

-												updateProblemIndication();

-											}

-										});

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

 							}

 							break;

 						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

 					}

 				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

+				else {

+					super.notifyChanged(notification);

 				}

+			}

 

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

 				}

-			};

+			}

+		};

 

 	/**

 	 * This listens for workspace changes.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IResourceChangeListener resourceChangeListener =

 			new IResourceChangeListener() {

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

 										}

 									}

-									return false;

 								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

+								return false;

 							}

 

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

+							return true;

 						}

 

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(NattabletesterEditor.this, false);

-											}

-										}

-									});

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

 						}

 

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == NattabletesterEditor.this) {

-												handleActivate();

-											}

-										}

-									});

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

 						}

 					}

-					catch (CoreException exception) {

-						NattableEditorPlugin.INSTANCE.log(exception);

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(NattabletesterEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == NattabletesterEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

 					}

 				}

-			};

+				catch (CoreException exception) {

+					NattableEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

 

 	/**

 	 * Handles activation of the editor or it's associated views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleActivate() {

 		// Recompute the read only state.

 		//

 		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

+		  editingDomain.getResourceToReadOnlyMap().clear();

 

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

 		}

 

 		if (!removedResources.isEmpty()) {

@@ -588,7 +556,6 @@ public class NattabletesterEditor
 	 * Handles what to do with changed resources on activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleChangedResources() {

@@ -604,7 +571,8 @@ public class NattabletesterEditor
 					resource.unload();

 					try {

 						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

+					}

+					catch (IOException exception) {

 						if (!resourceToDiagnosticMap.containsKey(resource)) {

 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

@@ -625,17 +593,17 @@ public class NattabletesterEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void updateProblemIndication() {

 		if (updateProblemIndication) {

 			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

 			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

 				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

 					diagnostic.add(childDiagnostic);

@@ -644,7 +612,7 @@ public class NattabletesterEditor
 

 			int lastEditorPage = getPageCount() - 1;

 			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					setActivePage(lastEditorPage);

 				}

@@ -658,7 +626,8 @@ public class NattabletesterEditor
 					setPageText(lastEditorPage, problemEditorPart.getPartName());

 					setActivePage(lastEditorPage);

 					showTabs();

-				} catch (PartInitException exception) {

+				}

+				catch (PartInitException exception) {

 					NattableEditorPlugin.INSTANCE.log(exception);

 				}

 			}

@@ -668,7 +637,8 @@ public class NattabletesterEditor
 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					try {

 						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

+					}

+					catch (CoreException exception) {

 						NattableEditorPlugin.INSTANCE.log(exception);

 					}

 				}

@@ -680,21 +650,20 @@ public class NattabletesterEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

+		return

+			MessageDialog.openQuestion

 				(getSite().getShell(),

-						getString("_UI_FileConflict_label"), //$NON-NLS-1$

-						getString("_WARN_FileConflict")); //$NON-NLS-1$

+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

+				 getString("_WARN_FileConflict")); //$NON-NLS-1$

 	}

 

 	/**

 	 * This creates a model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattabletesterEditor() {

@@ -706,7 +675,6 @@ public class NattabletesterEditor
 	 * This sets up the editing domain for the model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void initializeEditingDomain() {

@@ -735,32 +703,32 @@ public class NattabletesterEditor
 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

 		//

 		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

 

 		// Create the editing domain with a special command stack.

 		//

@@ -771,7 +739,6 @@ public class NattabletesterEditor
 	 * This is here for the listener to be able to call it.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -783,7 +750,6 @@ public class NattabletesterEditor
 	 * This sets the selection into whichever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setSelectionToViewer(Collection<?> collection) {

@@ -792,25 +758,25 @@ public class NattabletesterEditor
 		//

 		if (theSelection != null && !theSelection.isEmpty()) {

 			Runnable runnable =

-					new Runnable() {

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

 						}

-					};

+					}

+				};

 			getSite().getShell().getDisplay().asyncExec(runnable);

 		}

 	}

 

 	/**

 	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -821,14 +787,12 @@ public class NattabletesterEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

@@ -838,11 +802,10 @@ public class NattabletesterEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getElements(Object object) {

+		public Object [] getElements(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -850,11 +813,10 @@ public class NattabletesterEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getChildren(Object object) {

+		public Object [] getChildren(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -862,7 +824,6 @@ public class NattabletesterEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -874,7 +835,6 @@ public class NattabletesterEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -886,7 +846,6 @@ public class NattabletesterEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewerPane(ViewerPane viewerPane) {

@@ -904,7 +863,6 @@ public class NattabletesterEditor
 	 * is the current one.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewer(Viewer viewer) {

@@ -915,13 +873,13 @@ public class NattabletesterEditor
 				// Create the listener on demand.

 				//

 				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

 			}

 

 			// Stop listening to the old one.

@@ -950,7 +908,6 @@ public class NattabletesterEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -962,7 +919,6 @@ public class NattabletesterEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void createContextMenuFor(StructuredViewer viewer) {

@@ -970,7 +926,7 @@ public class NattabletesterEditor
 		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

 		contextMenu.setRemoveAllWhenShown(true);

 		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

 		viewer.getControl().setMenu(menu);

 		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

 

@@ -984,25 +940,25 @@ public class NattabletesterEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

 		Exception exception = null;

 		Resource resource = null;

 		try {

 			// Load the resource through the editing domain.

 			//

 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

+		}

+		catch (Exception e) {

 			exception = e;

 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

 		}

 

 		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

 		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

 		}

 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

 	}

@@ -1012,25 +968,29 @@ public class NattabletesterEditor
 	 * and the specified exception (if any).

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+		boolean hasErrors = !resource.getErrors().isEmpty();

+		if (hasErrors || !resource.getWarnings().isEmpty()) {

 			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-							new Object[] { exception == null ? (Object) resource : exception });

+				new BasicDiagnostic

+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object [] { exception == null ? (Object)resource : exception });

 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

 			return basicDiagnostic;

 		}

 		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					new Object[] { exception });

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object[] { exception });

 		}

 		else {

 			return Diagnostic.OK_INSTANCE;

@@ -1041,7 +1001,6 @@ public class NattabletesterEditor
 	 * This is the method used by the framework to install your own controls.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1057,23 +1016,22 @@ public class NattabletesterEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

 				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 

 				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1092,23 +1050,22 @@ public class NattabletesterEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				parentViewer = (TreeViewer) viewerPane.getViewer();

+				parentViewer = (TreeViewer)viewerPane.getViewer();

 				parentViewer.setAutoExpandLevel(30);

 				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

 				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1122,20 +1079,19 @@ public class NattabletesterEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

+				listViewer = (ListViewer)viewerPane.getViewer();

 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1148,20 +1104,19 @@ public class NattabletesterEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

+				treeViewer = (TreeViewer)viewerPane.getViewer();

 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1176,20 +1131,19 @@ public class NattabletesterEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

+				tableViewer = (TableViewer)viewerPane.getViewer();

 

 				Table table = tableViewer.getTable();

 				TableLayout layout = new TableLayout();

@@ -1207,7 +1161,7 @@ public class NattabletesterEditor
 				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

 				selfColumn.setResizable(true);

 

-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1220,21 +1174,20 @@ public class NattabletesterEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattabletesterEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

 

 				Tree tree = treeViewerWithColumns.getTree();

 				tree.setLayoutData(new FillLayout());

@@ -1251,7 +1204,7 @@ public class NattabletesterEditor
 				selfColumn.setResizable(true);

 				selfColumn.setWidth(200);

 

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1261,36 +1214,35 @@ public class NattabletesterEditor
 			}

 

 			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						public void run() {

-							setActivePage(0);

-						}

-					});

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

 		}

 

 		// Ensures that this editor will only display the page's tab

 		// area if there are more than one page

 		//

 		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

 					}

-				});

+				}

+			 });

 

 		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					public void run() {

-						updateProblemIndication();

-					}

-				});

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

 	}

 

 	/**

@@ -1298,14 +1250,13 @@ public class NattabletesterEditor
 	 * this hides the single tab at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void hideTabs() {

 		if (getPageCount() <= 1) {

 			setPageText(0, ""); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

+				((CTabFolder)getContainer()).setTabHeight(1);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y + 6);

 			}

@@ -1317,14 +1268,13 @@ public class NattabletesterEditor
 	 * this shows the tabs at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void showTabs() {

 		if (getPageCount() > 1) {

 			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y - 6);

 			}

@@ -1335,7 +1285,6 @@ public class NattabletesterEditor
 	 * This is used to track the active viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1351,7 +1300,6 @@ public class NattabletesterEditor
 	 * This is how the framework determines which interfaces we implement.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("rawtypes")

@@ -1375,7 +1323,6 @@ public class NattabletesterEditor
 	 * This accesses a cached version of the content outliner.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IContentOutlinePage getContentOutlinePage() {

@@ -1400,9 +1347,9 @@ public class NattabletesterEditor
 					createContextMenuFor(contentOutlineViewer);

 

 					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 					}

 				}

 

@@ -1424,13 +1371,13 @@ public class NattabletesterEditor
 			// Listen to selection so that we can handle it is a special way.

 			//

 			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

 		}

 

 		return contentOutlinePage;

@@ -1440,24 +1387,23 @@ public class NattabletesterEditor
 	 * This accesses a cached version of the property sheet.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

 		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						NattabletesterEditor.this.setSelectionToViewer(selection);

-						NattabletesterEditor.this.setFocus();

-					}

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					NattabletesterEditor.this.setSelectionToViewer(selection);

+					NattabletesterEditor.this.setFocus();

+				}

 

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

 		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

 		propertySheetPages.add(propertySheetPage);

 

@@ -1468,12 +1414,11 @@ public class NattabletesterEditor
 	 * This deals with how we want selection in the outliner to affect the other views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void handleContentOutlineSelection(ISelection selection) {

 		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

 			if (selectedElements.hasNext()) {

 				// Get the first selected element.

 				//

@@ -1508,19 +1453,17 @@ public class NattabletesterEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

 	}

 

 	/**

 	 * This is for implementing {@link IEditorPart} and simply saves the model file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1534,31 +1477,31 @@ public class NattabletesterEditor
 		// Do the work within an operation because this is a long running activity that modifies the workbench.

 		//

 		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

 					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

 								}

-								first = false;

 							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

 						}

 					}

-				};

+				}

+			};

 

 		updateProblemIndication = false;

 		try {

@@ -1568,9 +1511,10 @@ public class NattabletesterEditor
 

 			// Refresh the necessary state.

 			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

 			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			// Something went wrong that shouldn't.

 			//

 			NattableEditorPlugin.INSTANCE.log(exception);

@@ -1584,7 +1528,6 @@ public class NattabletesterEditor
 	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean isPersisted(Resource resource) {

@@ -1595,7 +1538,8 @@ public class NattabletesterEditor
 				result = true;

 				stream.close();

 			}

-		} catch (IOException e) {

+		}

+		catch (IOException e) {

 			// Ignore

 		}

 		return result;

@@ -1605,7 +1549,6 @@ public class NattabletesterEditor
 	 * This always returns true because it is not currently supported.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1617,7 +1560,6 @@ public class NattabletesterEditor
 	 * This also changes the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1636,7 +1578,6 @@ public class NattabletesterEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void doSaveAs(URI uri, IEditorInput editorInput) {

@@ -1644,16 +1585,15 @@ public class NattabletesterEditor
 		setInputWithNotify(editorInput);

 		setPartName(editorInput.getName());

 		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

 		doSave(progressMonitor);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1668,7 +1608,6 @@ public class NattabletesterEditor
 	 * This is called during startup.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1684,7 +1623,6 @@ public class NattabletesterEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1701,7 +1639,6 @@ public class NattabletesterEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1713,7 +1650,6 @@ public class NattabletesterEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1725,7 +1661,6 @@ public class NattabletesterEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1738,7 +1673,6 @@ public class NattabletesterEditor
 	 * Calling this result will notify the listeners.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1754,30 +1688,29 @@ public class NattabletesterEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setStatusLineManager(ISelection selection) {

 		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

 

 		if (statusLineManager != null) {

 			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

 				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-					break;

-				}

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

+						break;

+					}

 				}

 			}

 			else {

@@ -1790,7 +1723,6 @@ public class NattabletesterEditor
 	 * This looks up a string in the plugin's plugin.properties file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key) {

@@ -1801,39 +1733,35 @@ public class NattabletesterEditor
 	 * This looks up a string in plugin.properties, making a substitution.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

 	}

 

 	/**

 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IActionBars getActionBars() {

@@ -1843,7 +1771,6 @@ public class NattabletesterEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AdapterFactory getAdapterFactory() {

@@ -1853,7 +1780,6 @@ public class NattabletesterEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1885,7 +1811,6 @@ public class NattabletesterEditor
 	 * Returns whether the outline view should be presented to the user.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean showOutlineView() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
index a40bae10c74..e30bfed16b8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
@@ -75,7 +75,6 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattabletesterModelWizard extends Wizard implements INewWizard {

@@ -83,7 +82,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final List<String> FILE_EXTENSIONS =

@@ -93,7 +91,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final String FORMATTED_FILE_EXTENSIONS =

@@ -103,7 +100,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattabletesterPackage nattabletesterPackage = NattabletesterPackage.eINSTANCE;

@@ -112,7 +108,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattabletesterFactory nattabletesterFactory = nattabletesterPackage.getNattabletesterFactory();

@@ -121,7 +116,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattabletesterModelWizardNewFileCreationPage newFileCreationPage;

@@ -130,7 +124,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattabletesterModelWizardInitialObjectCreationPage initialObjectCreationPage;

@@ -139,7 +132,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStructuredSelection selection;

@@ -148,7 +140,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IWorkbench workbench;

@@ -157,7 +148,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<String> initialObjectNames;

@@ -166,7 +156,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -181,7 +170,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<String> getInitialObjectNames() {

@@ -189,7 +177,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 			initialObjectNames = new ArrayList<String>();

 			for (EClassifier eClassifier : nattabletesterPackage.getEClassifiers()) {

 				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

+					EClass eClass = (EClass)eClassifier;

 					if (!eClass.isAbstract()) {

 						initialObjectNames.add(eClass.getName());

 					}

@@ -204,11 +192,10 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObject createInitialModel() {

-		EClass eClass = (EClass) nattabletesterPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EClass eClass = (EClass)nattabletesterPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

 		EObject rootObject = nattabletesterFactory.create(eClass);

 		return rootObject;

 	}

@@ -217,7 +204,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -230,43 +216,43 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 			// Do the work within an operation.

 			//

 			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								NattableEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

 							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							NattableEditorPlugin.INSTANCE.log(exception);

 						}

-					};

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

 

 			getContainer().run(false, false, operation);

 

@@ -278,26 +264,28 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 			if (activePart instanceof ISetSelectionTarget) {

 				final ISelection targetSelection = new StructuredSelection(modelFile);

 				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

 			}

 

 			// Open an editor on the new file.

 			//

 			try {

 				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

 				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

 				return false;

 			}

 

 			return true;

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			NattableEditorPlugin.INSTANCE.log(exception);

 			return false;

 		}

@@ -307,7 +295,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattabletesterModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

@@ -315,7 +302,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattabletesterModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

@@ -326,7 +312,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -335,7 +320,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 				String extension = new Path(getFileName()).getFileExtension();

 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

 					return false;

 				}

 				return true;

@@ -346,7 +331,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public IFile getModelFile() {

@@ -358,14 +342,12 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattabletesterModelWizardInitialObjectCreationPage extends WizardPage {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo initialObjectField;

@@ -380,7 +362,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo encodingField;

@@ -389,7 +370,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattabletesterModelWizardInitialObjectCreationPage(String pageId) {

@@ -399,13 +379,11 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

 		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

+			Composite composite = new Composite(parent, SWT.NONE); {

 				GridLayout layout = new GridLayout();

 				layout.numColumns = 1;

 				layout.verticalSpacing = 12;

@@ -474,20 +452,18 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected ModifyListener validator =

 				new ModifyListener() {

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected boolean validatePage() {

@@ -497,7 +473,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -518,7 +493,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getInitialObjectName() {

@@ -535,7 +509,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getEncoding() {

@@ -546,13 +519,13 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected String getLabel(String typeName) {

 			try {

 				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (MissingResourceException mre) {

+			}

+			catch(MissingResourceException mre) {

 				NattableEditorPlugin.INSTANCE.log(mre);

 			}

 			return typeName;

@@ -561,13 +534,12 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Collection<String> getEncodings() {

 			if (encodings == null) {

 				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$

+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

 				{

 					encodings.add(stringTokenizer.nextToken());

 				}

@@ -580,7 +552,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -602,7 +573,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 			if (selectedElement instanceof IResource) {

 				// Get the resource parent, if its a file.

 				//

-				IResource selectedResource = (IResource) selectedElement;

+				IResource selectedResource = (IResource)selectedElement;

 				if (selectedResource.getType() == IResource.FILE) {

 					selectedResource = selectedResource.getParent();

 				}

@@ -619,7 +590,7 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattabletesterEditorFilenameDefaultBase"); //$NON-NLS-1$

 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

 					}

 					newFileCreationPage.setFileName(modelFilename);

@@ -636,7 +607,6 @@ public class NattabletesterModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IFile getModelFile() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
index 3a1ea9498ad..161cc9ae337 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
@@ -48,7 +48,6 @@ import org.eclipse.ui.PartInitException;
  * This is the action bar contributor for the Nattable model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableActionBarContributor

@@ -58,7 +57,6 @@ public class NattableActionBarContributor
 	 * This keeps track of the active editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IEditorPart activeEditorPart;

@@ -67,7 +65,6 @@ public class NattableActionBarContributor
 	 * This keeps track of the current selection provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionProvider selectionProvider;

@@ -76,56 +73,53 @@ public class NattableActionBarContributor
 	 * 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);

-					}

+		{

+			@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 boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

 

-				@Override

-				public void run() {

-					if (activeEditorPart instanceof IViewerProvider) {

-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();

-						if (viewer != null) {

-							viewer.refresh();

-						}

+			@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;

@@ -134,7 +128,6 @@ public class NattableActionBarContributor
 	 * 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;

@@ -144,7 +137,6 @@ public class NattableActionBarContributor
 	 * generated for the current selection by the item provider.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> createSiblingActions;

@@ -153,7 +145,6 @@ public class NattableActionBarContributor
 	 * 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;

@@ -162,7 +153,6 @@ public class NattableActionBarContributor
 	 * This creates an instance of the contributor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableActionBarContributor() {

@@ -176,7 +166,6 @@ public class NattableActionBarContributor
 	 * This adds Separators for editor additions to the tool bar.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -190,7 +179,6 @@ public class NattableActionBarContributor
 	 * as well as the sub-menus for object creation items.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -217,11 +205,11 @@ public class NattableActionBarContributor
 		// Force an update because Eclipse hides empty menus now.

 		//

 		submenuManager.addMenuListener

-				(new IMenuListener() {

-					public void menuAboutToShow(IMenuManager menuManager) {

-						menuManager.updateAll(true);

-					}

-				});

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

 

 		addGlobalActions(submenuManager);

 	}

@@ -230,7 +218,6 @@ public class NattableActionBarContributor
 	 * 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

@@ -264,7 +251,6 @@ public class NattableActionBarContributor
 	 * that can be added to the selected object and updating the menus accordingly.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -284,10 +270,10 @@ public class NattableActionBarContributor
 		Collection<?> newSiblingDescriptors = null;

 

 		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {

-			Object object = ((IStructuredSelection) selection).getFirstElement();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

 

-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

 

 			newChildDescriptors = domain.getNewChildDescriptors(object, null);

 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

@@ -313,7 +299,6 @@ public class NattableActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

@@ -331,7 +316,6 @@ public class NattableActionBarContributor
 	 * and returns the collection of these actions.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

@@ -351,7 +335,6 @@ public class NattableActionBarContributor
 	 * 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) {

@@ -372,7 +355,6 @@ public class NattableActionBarContributor
 	 * 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) {

@@ -383,13 +365,13 @@ public class NattableActionBarContributor
 				//

 				IContributionItem contributionItem = items[i];

 				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

 				}

 

 				// Delete the ActionContributionItems with matching action.

 				//

 				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem) contributionItem).getAction();

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

 					if (actions.contains(action)) {

 						manager.remove(contributionItem);

 					}

@@ -402,7 +384,6 @@ public class NattableActionBarContributor
 	 * This populates the pop-up menu before it appears.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -423,7 +404,6 @@ public class NattableActionBarContributor
 	 * This inserts global actions before the "additions-end" separator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -431,7 +411,7 @@ public class NattableActionBarContributor
 		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());

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

 		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

 

 		super.addGlobalActions(menuManager);

@@ -441,7 +421,6 @@ public class NattableActionBarContributor
 	 * This ensures that a delete action will clean up all references to deleted objects.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
index b365238d4e8..f18b5bd6a87 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
@@ -144,7 +144,6 @@ import org.eclipse.ui.views.properties.PropertySheetPage;
  * This is an example of a Nattable model editor.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableEditor

@@ -154,7 +153,6 @@ public class NattableEditor
 	 * This keeps track of the editing domain that is used to track all changes to the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected AdapterFactoryEditingDomain editingDomain;

@@ -163,7 +161,6 @@ public class NattableEditor
 	 * This is the one adapter factory used for providing views of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory adapterFactory;

@@ -172,7 +169,6 @@ public class NattableEditor
 	 * This is the content outline page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IContentOutlinePage contentOutlinePage;

@@ -181,7 +177,6 @@ public class NattableEditor
 	 * This is a kludge...

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStatusLineManager contentOutlineStatusLineManager;

@@ -190,7 +185,6 @@ public class NattableEditor
 	 * This is the content outline page's viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer contentOutlineViewer;

@@ -199,7 +193,6 @@ public class NattableEditor
 	 * This is the property sheet page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

@@ -209,7 +202,6 @@ public class NattableEditor
 	 * The parent relation must be correctly defined for this to work.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer selectionViewer;

@@ -218,7 +210,6 @@ public class NattableEditor
 	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer parentViewer;

@@ -227,7 +218,6 @@ public class NattableEditor
 	 * This shows how a tree view works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewer;

@@ -237,7 +227,6 @@ public class NattableEditor
 	 * A list viewer doesn't support icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ListViewer listViewer;

@@ -247,7 +236,6 @@ public class NattableEditor
 	 * A table can be used as a list with icons.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TableViewer tableViewer;

@@ -256,7 +244,6 @@ public class NattableEditor
 	 * This shows how a tree view with columns works.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected TreeViewer treeViewerWithColumns;

@@ -265,7 +252,6 @@ public class NattableEditor
 	 * This keeps track of the active viewer pane, in the book.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ViewerPane currentViewerPane;

@@ -274,7 +260,6 @@ public class NattableEditor
 	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Viewer currentViewer;

@@ -283,7 +268,6 @@ public class NattableEditor
 	 * This listens to which ever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelectionChangedListener selectionChangedListener;

@@ -292,7 +276,6 @@ public class NattableEditor
 	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

@@ -301,7 +284,6 @@ public class NattableEditor
 	 * This keeps track of the selection of the editor as a whole.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected ISelection editorSelection = StructuredSelection.EMPTY;

@@ -311,7 +293,6 @@ public class NattableEditor
 	 * in Eclipse's Problems View.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

@@ -320,52 +301,46 @@ public class NattableEditor
 	 * This listens for when the outline becomes active

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IPartListener partListener =

 			new IPartListener() {

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(NattableEditor.this);

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(NattableEditor.this);

 

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(NattableEditor.this);

-							handleActivate();

-						}

+						setCurrentViewer(contentOutlineViewer);

 					}

-					else if (p == NattableEditor.this) {

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(NattableEditor.this);

 						handleActivate();

 					}

 				}

-

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

+				else if (p == NattableEditor.this) {

+					handleActivate();

 				}

-

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

 

 	/**

 	 * Resources that have been removed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> removedResources = new ArrayList<Resource>();

@@ -374,7 +349,6 @@ public class NattableEditor
 	 * Resources that have been changed since last activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> changedResources = new ArrayList<Resource>();

@@ -383,7 +357,6 @@ public class NattableEditor
 	 * Resources that have been saved.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<Resource> savedResources = new ArrayList<Resource>();

@@ -392,7 +365,6 @@ public class NattableEditor
 	 * Map to store the diagnostic associated with a resource.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

@@ -401,7 +373,6 @@ public class NattableEditor
 	 * Controls whether the problem indication should be updated.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean updateProblemIndication = true;

@@ -410,19 +381,18 @@ public class NattableEditor
 	 * Adapter used to update the problem indication when resources are demanded loaded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EContentAdapter problemIndicationAdapter =

 			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

 						case Resource.RESOURCE__IS_LOADED:

 						case Resource.RESOURCE__ERRORS:

 						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

+							Resource resource = (Resource)notification.getNotifier();

 							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

 							if (diagnostic.getSeverity() != Diagnostic.OK) {

 								resourceToDiagnosticMap.put(resource, diagnostic);

@@ -433,136 +403,134 @@ public class NattableEditor
 

 							if (updateProblemIndication) {

 								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											public void run() {

-												updateProblemIndication();

-											}

-										});

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

 							}

 							break;

 						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

 					}

 				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

+				else {

+					super.notifyChanged(notification);

 				}

+			}

 

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

 				}

-			};

+			}

+		};

 

 	/**

 	 * This listens for workspace changes.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IResourceChangeListener resourceChangeListener =

 			new IResourceChangeListener() {

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

 										}

 									}

-									return false;

 								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

+								return false;

 							}

 

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

+							return true;

 						}

 

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(NattableEditor.this, false);

-											}

-										}

-									});

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

 						}

 

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == NattableEditor.this) {

-												handleActivate();

-											}

-										}

-									});

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

 						}

 					}

-					catch (CoreException exception) {

-						NattableEditorPlugin.INSTANCE.log(exception);

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(NattableEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == NattableEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

 					}

 				}

-			};

+				catch (CoreException exception) {

+					NattableEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

 

 	/**

 	 * Handles activation of the editor or it's associated views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleActivate() {

 		// Recompute the read only state.

 		//

 		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

+		  editingDomain.getResourceToReadOnlyMap().clear();

 

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

 		}

 

 		if (!removedResources.isEmpty()) {

@@ -587,7 +555,6 @@ public class NattableEditor
 	 * Handles what to do with changed resources on activation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void handleChangedResources() {

@@ -603,7 +570,8 @@ public class NattableEditor
 					resource.unload();

 					try {

 						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

+					}

+					catch (IOException exception) {

 						if (!resourceToDiagnosticMap.containsKey(resource)) {

 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

 						}

@@ -624,17 +592,17 @@ public class NattableEditor
 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void updateProblemIndication() {

 		if (updateProblemIndication) {

 			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

 			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

 				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

 					diagnostic.add(childDiagnostic);

@@ -643,7 +611,7 @@ public class NattableEditor
 

 			int lastEditorPage = getPageCount() - 1;

 			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					setActivePage(lastEditorPage);

 				}

@@ -657,7 +625,8 @@ public class NattableEditor
 					setPageText(lastEditorPage, problemEditorPart.getPartName());

 					setActivePage(lastEditorPage);

 					showTabs();

-				} catch (PartInitException exception) {

+				}

+				catch (PartInitException exception) {

 					NattableEditorPlugin.INSTANCE.log(exception);

 				}

 			}

@@ -667,7 +636,8 @@ public class NattableEditor
 				if (diagnostic.getSeverity() != Diagnostic.OK) {

 					try {

 						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

+					}

+					catch (CoreException exception) {

 						NattableEditorPlugin.INSTANCE.log(exception);

 					}

 				}

@@ -679,21 +649,20 @@ public class NattableEditor
 	 * Shows a dialog that asks if conflicting changes should be discarded.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

+		return

+			MessageDialog.openQuestion

 				(getSite().getShell(),

-						getString("_UI_FileConflict_label"), //$NON-NLS-1$

-						getString("_WARN_FileConflict")); //$NON-NLS-1$

+				 getString("_UI_FileConflict_label"), //$NON-NLS-1$

+				 getString("_WARN_FileConflict")); //$NON-NLS-1$

 	}

 

 	/**

 	 * This creates a model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableEditor() {

@@ -705,7 +674,6 @@ public class NattableEditor
 	 * This sets up the editing domain for the model editor.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void initializeEditingDomain() {

@@ -734,32 +702,32 @@ public class NattableEditor
 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

 		//

 		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

 

 		// Create the editing domain with a special command stack.

 		//

@@ -770,7 +738,6 @@ public class NattableEditor
 	 * This is here for the listener to be able to call it.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -782,7 +749,6 @@ public class NattableEditor
 	 * This sets the selection into whichever viewer is active.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setSelectionToViewer(Collection<?> collection) {

@@ -791,25 +757,25 @@ public class NattableEditor
 		//

 		if (theSelection != null && !theSelection.isEmpty()) {

 			Runnable runnable =

-					new Runnable() {

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

 						}

-					};

+					}

+				};

 			getSite().getShell().getDisplay().asyncExec(runnable);

 		}

 	}

 

 	/**

 	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -820,14 +786,12 @@ public class NattableEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

@@ -837,11 +801,10 @@ public class NattableEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getElements(Object object) {

+		public Object [] getElements(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -849,11 +812,10 @@ public class NattableEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

-		public Object[] getChildren(Object object) {

+		public Object [] getChildren(Object object) {

 			Object parent = super.getParent(object);

 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

 		}

@@ -861,7 +823,6 @@ public class NattableEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -873,7 +834,6 @@ public class NattableEditor
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -885,7 +845,6 @@ public class NattableEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewerPane(ViewerPane viewerPane) {

@@ -903,7 +862,6 @@ public class NattableEditor
 	 * is the current one.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setCurrentViewer(Viewer viewer) {

@@ -914,13 +872,13 @@ public class NattableEditor
 				// Create the listener on demand.

 				//

 				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

 			}

 

 			// Stop listening to the old one.

@@ -949,7 +907,6 @@ public class NattableEditor
 	 * This returns the viewer as required by the {@link IViewerProvider} interface.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -961,7 +918,6 @@ public class NattableEditor
 	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void createContextMenuFor(StructuredViewer viewer) {

@@ -969,7 +925,7 @@ public class NattableEditor
 		contextMenu.add(new Separator("additions")); //$NON-NLS-1$

 		contextMenu.setRemoveAllWhenShown(true);

 		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

 		viewer.getControl().setMenu(menu);

 		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

 

@@ -983,25 +939,25 @@ public class NattableEditor
 	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());

 		Exception exception = null;

 		Resource resource = null;

 		try {

 			// Load the resource through the editing domain.

 			//

 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

+		}

+		catch (Exception e) {

 			exception = e;

 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

 		}

 

 		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

 		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

 		}

 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

 	}

@@ -1011,25 +967,29 @@ public class NattableEditor
 	 * and the specified exception (if any).

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+		boolean hasErrors = !resource.getErrors().isEmpty();

+		if (hasErrors || !resource.getWarnings().isEmpty()) {

 			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-							new Object[] { exception == null ? (Object) resource : exception });

+				new BasicDiagnostic

+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object [] { exception == null ? (Object)resource : exception });

 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

 			return basicDiagnostic;

 		}

 		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

-					new Object[] { exception });

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.infra.nattable.model.editor", //$NON-NLS-1$

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$

+					 new Object[] { exception });

 		}

 		else {

 			return Diagnostic.OK_INSTANCE;

@@ -1040,7 +1000,6 @@ public class NattableEditor
 	 * This is the method used by the framework to install your own controls.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1056,23 +1015,22 @@ public class NattableEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

 				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 

 				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1091,23 +1049,22 @@ public class NattableEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				parentViewer = (TreeViewer) viewerPane.getViewer();

+				parentViewer = (TreeViewer)viewerPane.getViewer();

 				parentViewer.setAutoExpandLevel(30);

 				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

 				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

@@ -1121,20 +1078,19 @@ public class NattableEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

+				listViewer = (ListViewer)viewerPane.getViewer();

 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1147,20 +1103,19 @@ public class NattableEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

+				treeViewer = (TreeViewer)viewerPane.getViewer();

 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1175,20 +1130,19 @@ public class NattableEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

+				tableViewer = (TableViewer)viewerPane.getViewer();

 

 				Table table = tableViewer.getTable();

 				TableLayout layout = new TableLayout();

@@ -1206,7 +1160,7 @@ public class NattableEditor
 				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$

 				selfColumn.setResizable(true);

 

-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1219,21 +1173,20 @@ public class NattableEditor
 			//

 			{

 				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), NattableEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

+					new ViewerPane(getSite().getPage(), NattableEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

 				viewerPane.createControl(getContainer());

 

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

 

 				Tree tree = treeViewerWithColumns.getTree();

 				tree.setLayoutData(new FillLayout());

@@ -1250,7 +1203,7 @@ public class NattableEditor
 				selfColumn.setResizable(true);

 				selfColumn.setWidth(200);

 

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$

 				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

 				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

 

@@ -1260,36 +1213,35 @@ public class NattableEditor
 			}

 

 			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						public void run() {

-							setActivePage(0);

-						}

-					});

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

 		}

 

 		// Ensures that this editor will only display the page's tab

 		// area if there are more than one page

 		//

 		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

 					}

-				});

+				}

+			 });

 

 		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					public void run() {

-						updateProblemIndication();

-					}

-				});

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

 	}

 

 	/**

@@ -1297,14 +1249,13 @@ public class NattableEditor
 	 * this hides the single tab at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void hideTabs() {

 		if (getPageCount() <= 1) {

 			setPageText(0, ""); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

+				((CTabFolder)getContainer()).setTabHeight(1);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y + 6);

 			}

@@ -1316,14 +1267,13 @@ public class NattableEditor
 	 * this shows the tabs at the bottom.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void showTabs() {

 		if (getPageCount() > 1) {

 			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$

 			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

 				Point point = getContainer().getSize();

 				getContainer().setSize(point.x, point.y - 6);

 			}

@@ -1334,7 +1284,6 @@ public class NattableEditor
 	 * This is used to track the active viewer.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1350,7 +1299,6 @@ public class NattableEditor
 	 * This is how the framework determines which interfaces we implement.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("rawtypes")

@@ -1374,7 +1322,6 @@ public class NattableEditor
 	 * This accesses a cached version of the content outliner.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IContentOutlinePage getContentOutlinePage() {

@@ -1399,9 +1346,9 @@ public class NattableEditor
 					createContextMenuFor(contentOutlineViewer);

 

 					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

 					}

 				}

 

@@ -1423,13 +1370,13 @@ public class NattableEditor
 			// Listen to selection so that we can handle it is a special way.

 			//

 			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

 		}

 

 		return contentOutlinePage;

@@ -1439,24 +1386,23 @@ public class NattableEditor
 	 * This accesses a cached version of the property sheet.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IPropertySheetPage getPropertySheetPage() {

 		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						NattableEditor.this.setSelectionToViewer(selection);

-						NattableEditor.this.setFocus();

-					}

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					NattableEditor.this.setSelectionToViewer(selection);

+					NattableEditor.this.setFocus();

+				}

 

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

 		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

 		propertySheetPages.add(propertySheetPage);

 

@@ -1467,12 +1413,11 @@ public class NattableEditor
 	 * This deals with how we want selection in the outliner to affect the other views.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void handleContentOutlineSelection(ISelection selection) {

 		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

 			if (selectedElements.hasNext()) {

 				// Get the first selected element.

 				//

@@ -1507,19 +1452,17 @@ public class NattableEditor
 	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

 	}

 

 	/**

 	 * This is for implementing {@link IEditorPart} and simply saves the model file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1533,31 +1476,31 @@ public class NattableEditor
 		// Do the work within an operation because this is a long running activity that modifies the workbench.

 		//

 		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

 					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

 								}

-								first = false;

 							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

 						}

 					}

-				};

+				}

+			};

 

 		updateProblemIndication = false;

 		try {

@@ -1567,9 +1510,10 @@ public class NattableEditor
 

 			// Refresh the necessary state.

 			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

 			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			// Something went wrong that shouldn't.

 			//

 			NattableEditorPlugin.INSTANCE.log(exception);

@@ -1583,7 +1527,6 @@ public class NattableEditor
 	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean isPersisted(Resource resource) {

@@ -1594,7 +1537,8 @@ public class NattableEditor
 				result = true;

 				stream.close();

 			}

-		} catch (IOException e) {

+		}

+		catch (IOException e) {

 			// Ignore

 		}

 		return result;

@@ -1604,7 +1548,6 @@ public class NattableEditor
 	 * This always returns true because it is not currently supported.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1616,7 +1559,6 @@ public class NattableEditor
 	 * This also changes the editor's input.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1635,7 +1577,6 @@ public class NattableEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected void doSaveAs(URI uri, IEditorInput editorInput) {

@@ -1643,16 +1584,15 @@ public class NattableEditor
 		setInputWithNotify(editorInput);

 		setPartName(editorInput.getName());

 		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

 		doSave(progressMonitor);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1667,7 +1607,6 @@ public class NattableEditor
 	 * This is called during startup.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1683,7 +1622,6 @@ public class NattableEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1700,7 +1638,6 @@ public class NattableEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1712,7 +1649,6 @@ public class NattableEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1724,7 +1660,6 @@ public class NattableEditor
 	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1737,7 +1672,6 @@ public class NattableEditor
 	 * Calling this result will notify the listeners.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1753,30 +1687,29 @@ public class NattableEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public void setStatusLineManager(ISelection selection) {

 		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

 

 		if (statusLineManager != null) {

 			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

 				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

-					break;

-				}

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$

+						break;

+					}

 				}

 			}

 			else {

@@ -1789,7 +1722,6 @@ public class NattableEditor
 	 * This looks up a string in the plugin's plugin.properties file.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key) {

@@ -1800,39 +1732,35 @@ public class NattableEditor
 	 * This looks up a string in plugin.properties, making a substitution.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static String getString(String key, Object s1) {

-		return NattableEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

+		return NattableEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

 	}

 

 	/**

 	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IActionBars getActionBars() {

@@ -1842,7 +1770,6 @@ public class NattableEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public AdapterFactory getAdapterFactory() {

@@ -1852,7 +1779,6 @@ public class NattableEditor
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -1884,7 +1810,6 @@ public class NattableEditor
 	 * Returns whether the outline view should be presented to the user.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected boolean showOutlineView() {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
index 1c580492e02..b12a703383a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
@@ -21,7 +21,6 @@ import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
  * This is the central singleton for the Nattable editor plugin.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public final class NattableEditorPlugin extends EMFPlugin {

@@ -29,7 +28,6 @@ public final class NattableEditorPlugin extends EMFPlugin {
 	 * Keep track of the singleton.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final NattableEditorPlugin INSTANCE = new NattableEditorPlugin();

@@ -38,7 +36,6 @@ public final class NattableEditorPlugin extends EMFPlugin {
 	 * Keep track of the singleton.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	private static Implementation plugin;

@@ -47,20 +44,19 @@ public final class NattableEditorPlugin extends EMFPlugin {
 	 * Create the instance.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public NattableEditorPlugin() {

-		super(new ResourceLocator[] {

+		super

+			(new ResourceLocator [] {

 				EcoreEditPlugin.INSTANCE,

-		});

+			});

 	}

 

 	/**

 	 * Returns the singleton instance of the Eclipse plugin.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @return the singleton instance.

 	 * @generated

 	 */

@@ -73,7 +69,6 @@ public final class NattableEditorPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @return the singleton instance.

 	 * @generated

 	 */

@@ -85,7 +80,6 @@ public final class NattableEditorPlugin extends EMFPlugin {
 	 * The actual implementation of the Eclipse <b>Plugin</b>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static class Implementation extends EclipseUIPlugin {

@@ -93,12 +87,11 @@ public final class NattableEditorPlugin extends EMFPlugin {
 		 * Creates an instance.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public Implementation() {

 			super();

-

+	

 			// Remember the static instance.

 			//

 			plugin = this;

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
index 49a3f26a9cb..c68abe548de 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
@@ -74,7 +74,6 @@ import org.eclipse.ui.part.ISetSelectionTarget;
  * This is a simple wizard for creating a new model file.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

- * 

  * @generated

  */

 public class NattableModelWizard extends Wizard implements INewWizard {

@@ -82,7 +81,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * The supported extensions for created files.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final List<String> FILE_EXTENSIONS =

@@ -92,7 +90,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * A formatted list of supported file extensions, suitable for display.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public static final String FORMATTED_FILE_EXTENSIONS =

@@ -102,7 +99,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattablePackage nattablePackage = NattablePackage.eINSTANCE;

@@ -111,7 +107,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This caches an instance of the model factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableFactory nattableFactory = nattablePackage.getNattableFactory();

@@ -120,7 +115,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This is the file creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableModelWizardNewFileCreationPage newFileCreationPage;

@@ -129,7 +123,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This is the initial object creation page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected NattableModelWizardInitialObjectCreationPage initialObjectCreationPage;

@@ -138,7 +131,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Remember the selection during initialization for populating the default container.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IStructuredSelection selection;

@@ -147,7 +139,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Remember the workbench during initialization.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected IWorkbench workbench;

@@ -156,7 +147,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Caches the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected List<String> initialObjectNames;

@@ -165,7 +155,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This just records the information.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -180,7 +169,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Returns the names of the types that can be created as the root object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected Collection<String> getInitialObjectNames() {

@@ -188,7 +176,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 			initialObjectNames = new ArrayList<String>();

 			for (EClassifier eClassifier : nattablePackage.getEClassifiers()) {

 				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass) eClassifier;

+					EClass eClass = (EClass)eClassifier;

 					if (!eClass.isAbstract()) {

 						initialObjectNames.add(eClass.getName());

 					}

@@ -203,11 +191,10 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Create a new model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	protected EObject createInitialModel() {

-		EClass eClass = (EClass) nattablePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EClass eClass = (EClass)nattablePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

 		EObject rootObject = nattableFactory.create(eClass);

 		return rootObject;

 	}

@@ -216,7 +203,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Do the work after everything is specified.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -229,43 +215,43 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 			// Do the work within an operation.

 			//

 			WorkspaceModifyOperation operation =

-					new WorkspaceModifyOperation() {

-						@Override

-						protected void execute(IProgressMonitor progressMonitor) {

-							try {

-								// Create a resource set

-								//

-								ResourceSet resourceSet = new ResourceSetImpl();

-

-								// Get the URI of the model file.

-								//

-								URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-								// Create a resource for this file.

-								//

-								Resource resource = resourceSet.createResource(fileURI);

-

-								// Add the initial model object to the contents.

-								//

-								EObject rootObject = createInitialModel();

-								if (rootObject != null) {

-									resource.getContents().add(rootObject);

-								}

-

-								// Save the contents of the resource to the file system.

-								//

-								Map<Object, Object> options = new HashMap<Object, Object>();

-								options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-								resource.save(options);

-							}

-							catch (Exception exception) {

-								NattableEditorPlugin.INSTANCE.log(exception);

-							}

-							finally {

-								progressMonitor.done();

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

 							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							NattableEditorPlugin.INSTANCE.log(exception);

 						}

-					};

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

 

 			getContainer().run(false, false, operation);

 

@@ -277,26 +263,28 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 			if (activePart instanceof ISetSelectionTarget) {

 				final ISelection targetSelection = new StructuredSelection(modelFile);

 				getShell().getDisplay().asyncExec

-						(new Runnable() {

-							public void run() {

-								((ISetSelectionTarget) activePart).selectReveal(targetSelection);

-							}

-						});

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

 			}

 

 			// Open an editor on the new file.

 			//

 			try {

 				page.openEditor

-						(new FileEditorInput(modelFile),

-								workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());

-			} catch (PartInitException exception) {

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

 				MessageDialog.openError(workbenchWindow.getShell(), NattableEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$

 				return false;

 			}

 

 			return true;

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			NattableEditorPlugin.INSTANCE.log(exception);

 			return false;

 		}

@@ -306,7 +294,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This is the one page of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

@@ -314,7 +301,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

@@ -325,7 +311,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		 * The framework calls this to see if the file is correct.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -334,7 +319,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 				String extension = new Path(getFileName()).getFileExtension();

 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

 					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$

-					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));

+					setErrorMessage(NattableEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

 					return false;

 				}

 				return true;

@@ -345,7 +330,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public IFile getModelFile() {

@@ -357,14 +341,12 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * This is the page where the type of object to create is selected.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public class NattableModelWizardInitialObjectCreationPage extends WizardPage {

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo initialObjectField;

@@ -379,7 +361,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Combo encodingField;

@@ -388,7 +369,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		 * Pass in the selection.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public NattableModelWizardInitialObjectCreationPage(String pageId) {

@@ -398,13 +378,11 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

 		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE);

-			{

+			Composite composite = new Composite(parent, SWT.NONE); {

 				GridLayout layout = new GridLayout();

 				layout.numColumns = 1;

 				layout.verticalSpacing = 12;

@@ -473,20 +451,18 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected ModifyListener validator =

 				new ModifyListener() {

-					public void modifyText(ModifyEvent e) {

-						setPageComplete(validatePage());

-					}

-				};

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

 

 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected boolean validatePage() {

@@ -496,7 +472,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		@Override

@@ -517,7 +492,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getInitialObjectName() {

@@ -534,7 +508,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		public String getEncoding() {

@@ -545,13 +518,13 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		 * Returns the label for the specified type name.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected String getLabel(String typeName) {

 			try {

 				return NattableEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (MissingResourceException mre) {

+			}

+			catch(MissingResourceException mre) {

 				NattableEditorPlugin.INSTANCE.log(mre);

 			}

 			return typeName;

@@ -560,13 +533,12 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 		/**

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * 

 		 * @generated

 		 */

 		protected Collection<String> getEncodings() {

 			if (encodings == null) {

 				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$

+				for (StringTokenizer stringTokenizer = new StringTokenizer(NattableEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) //$NON-NLS-1$

 				{

 					encodings.add(stringTokenizer.nextToken());

 				}

@@ -579,7 +551,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * The framework calls this to create the contents of the wizard.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -601,7 +572,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 			if (selectedElement instanceof IResource) {

 				// Get the resource parent, if its a file.

 				//

-				IResource selectedResource = (IResource) selectedElement;

+				IResource selectedResource = (IResource)selectedElement;

 				if (selectedResource.getType() == IResource.FILE) {

 					selectedResource = selectedResource.getParent();

 				}

@@ -618,7 +589,7 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 					String defaultModelBaseFilename = NattableEditorPlugin.INSTANCE.getString("_UI_NattableEditorFilenameDefaultBase"); //$NON-NLS-1$

 					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$

-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$

 					}

 					newFileCreationPage.setFileName(modelFilename);

@@ -635,7 +606,6 @@ public class NattableModelWizard extends Wizard implements INewWizard {
 	 * Get the file from the page.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * 

 	 * @generated

 	 */

 	public IFile getModelFile() {

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 d58d05b98cd..b73fcacc20d 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
@@ -42,7 +42,6 @@ Bundle-Localization: plugin
 Bundle-Name: %pluginName

 Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.Activator

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model;singleto

- n:=true

+Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Bundle-Description: %pluginDescription

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
index b8311689f56..a4c5032845f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
@@ -319,6 +319,21 @@
         </eAnnotations>

       </eStructuralFeatures>

     </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="OperationLabelProviderConfiguration"

+        eSuperTypes="#//nattablelabelprovider/ObjectLabelProviderConfiguration">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="documentation" value="LabelProviderConfiguration for Operation. In case of Operation, we have four display options : &#xD;&#xA;&lt;ul>&lt;li>display the icon of the Operation&lt;/li> &#xD;&#xA;&lt;li>display the label of the Operation&lt;/li>&#xD;&#xA;&lt;li>display the multiplicity of the Operation&lt;/li>&#xD;&#xA;&lt;li>display the type of the Operation&lt;/li>&#xD;&#xA;&lt;li>display the '/' for isDerived of the feature &lt;/li>&#xD;&#xA;&lt;li>display the name of the feature &lt;/li>&#xD;&#xA; &lt;/ul>"/>

+      </eAnnotations>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayType" lowerBound="1"

+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

+          defaultValueLiteral="true"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayMultiplicity"

+          lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

+          defaultValueLiteral="true"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" lowerBound="1"

+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

+          defaultValueLiteral="true"/>

+    </eClassifiers>

   </eSubpackages>

   <eSubpackages name="nattableaxisconfiguration" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

       nsPrefix="nattableaxisconfiguration">

@@ -661,7 +676,14 @@
         </eAnnotations>

       </eStructuralFeatures>

     </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="FeatureTreeItemAxis" eSuperTypes="#//nattableaxis/FeatureAxis #//nattableaxis/ITreeItemAxis"/>

+    <eClassifiers xsi:type="ecore:EClass" name="OperationAxis" abstract="true" eSuperTypes="#//nattableaxis/IAxis">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="localLabelConfiguration"

+          eType="#//nattablelabelprovider/OperationLabelProviderConfiguration" containment="true"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="FeatureTreeItemAxis" abstract="true"

+        eSuperTypes="#//nattableaxis/FeatureAxis #//nattableaxis/ITreeItemAxis"/>

+    <eClassifiers xsi:type="ecore:EClass" name="OperationTreeItemAxis" abstract="true"

+        eSuperTypes="#//nattableaxis/OperationAxis #//nattableaxis/ITreeItemAxis"/>

     <eClassifiers xsi:type="ecore:EClass" name="ObjectAxis" abstract="true" eSuperTypes="#//nattableaxis/IAxis">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="documentation" value="Abstract class used to reference object"/>

@@ -673,7 +695,8 @@
         </eAnnotations>

       </eStructuralFeatures>

     </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ObjectTreeItemAxis" eSuperTypes="#//nattableaxis/ObjectAxis #//nattableaxis/ITreeItemAxis"/>

+    <eClassifiers xsi:type="ecore:EClass" name="ObjectTreeItemAxis" abstract="true"

+        eSuperTypes="#//nattableaxis/ObjectAxis #//nattableaxis/ITreeItemAxis"/>

     <eClassifiers xsi:type="ecore:EClass" name="FeatureIdAxis" eSuperTypes="#//nattableaxis/IdAxis #//nattableaxis/FeatureAxis">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="documentation" value="IAxis used to represent feature using a string."/>

@@ -691,7 +714,15 @@
         </eAnnotations>

       </eStructuralFeatures>

     </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="EOperationAxis" eSuperTypes="#//nattableaxis/OperationAxis">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="documentation" value="IAxis used to reference EMF EOperation."/>

+      </eAnnotations>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"

+          eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EOperation"/>

+    </eClassifiers>

     <eClassifiers xsi:type="ecore:EClass" name="EStructuralFeatureTreeItemAxis" eSuperTypes="#//nattableaxis/EStructuralFeatureAxis #//nattableaxis/ITreeItemAxis"/>

+    <eClassifiers xsi:type="ecore:EClass" name="EOperationTreeItemAxis" eSuperTypes="#//nattableaxis/EOperationAxis #//nattableaxis/ITreeItemAxis"/>

     <eClassifiers xsi:type="ecore:EClass" name="ObjectIdAxis" eSuperTypes="#//nattableaxis/IdAxis #//nattableaxis/ObjectAxis">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="documentation" value="IAxis used to represent object using a string."/>

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
index 6846e6c58e6..3ba5a9fd274 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
@@ -12,4 +12,4 @@
 pluginName = Papyrus Nattable Model

 providerName = Eclipse Modeling Project

 

-pluginDescription=This plugin provides the metamodel used by the nattable editor.
\ No newline at end of file
+pluginDescription=This plugin provides the metamodel used by the nattable editor.

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
index 9dc940170fe..488de962481 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

  * @generated

  */

@@ -29,7 +28,6 @@ public interface NattableFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattableFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattableFactoryImpl.init();

@@ -38,7 +36,6 @@ public interface NattableFactory extends EFactory {
 	 * Returns a new object of class '<em>Table</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Table</em>'.

 	 * @generated

 	 */

@@ -48,7 +45,6 @@ public interface NattableFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
index a61c9762314..5f44991225c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
@@ -30,12 +30,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.N
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory

  * @model kind="package"

  *        annotation="http://www.eclipse.org/OCL/Import ecore='http://www.eclipse.org/emf/2002/Ecore#/'"

- *        annotation=

- *        "http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"

+ *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"

  * @generated

  */

 public interface NattablePackage extends EPackage {

@@ -44,7 +42,6 @@ public interface NattablePackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNAME = "nattable"; //$NON-NLS-1$

@@ -53,7 +50,6 @@ public interface NattablePackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model"; //$NON-NLS-1$

@@ -62,7 +58,6 @@ public interface NattablePackage extends EPackage {
 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "nattable"; //$NON-NLS-1$

@@ -71,7 +66,6 @@ public interface NattablePackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattablePackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl.init();

@@ -80,7 +74,6 @@ public interface NattablePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()

 	 * @generated

@@ -91,7 +84,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -101,7 +93,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -111,7 +102,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -121,7 +111,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -131,7 +120,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Context</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -141,7 +129,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Owner</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -151,7 +138,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Prototype</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -161,7 +147,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Table Configuration</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -171,7 +156,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Invert Axis</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -181,7 +165,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Column Axis Providers History</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -191,7 +174,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Row Axis Providers History</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -201,7 +183,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -211,7 +192,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -221,7 +201,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Current Row Axis Provider</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -231,7 +210,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Current Column Axis Provider</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -241,7 +219,6 @@ public interface NattablePackage extends EPackage {
 	 * The feature id for the '<em><b>Cells</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -251,7 +228,6 @@ public interface NattablePackage extends EPackage {
 	 * The number of structural features of the '<em>Table</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -261,7 +237,6 @@ public interface NattablePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -271,7 +246,6 @@ public interface NattablePackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -281,7 +255,6 @@ public interface NattablePackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -291,7 +264,6 @@ public interface NattablePackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -301,7 +273,6 @@ public interface NattablePackage extends EPackage {
 	 * The number of operations of the '<em>Table</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -311,7 +282,6 @@ public interface NattablePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Table</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table

 	 * @generated

@@ -322,7 +292,6 @@ public interface NattablePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Context</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext()

 	 * @see #getTable()

@@ -334,7 +303,6 @@ public interface NattablePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner <em>Owner</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Owner</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner()

 	 * @see #getTable()

@@ -346,7 +314,6 @@ public interface NattablePackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Prototype</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype()

 	 * @see #getTable()

@@ -355,11 +322,9 @@ public interface NattablePackage extends EPackage {
 	EReference getTable_Prototype();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration

-	 * <em>Table Configuration</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Table Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration()

 	 * @see #getTable()

@@ -371,7 +336,6 @@ public interface NattablePackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Invert Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis()

 	 * @see #getTable()

@@ -380,11 +344,9 @@ public interface NattablePackage extends EPackage {
 	EAttribute getTable_InvertAxis();

 

 	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Column Axis Providers History</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory()

 	 * @see #getTable()

@@ -393,11 +355,9 @@ public interface NattablePackage extends EPackage {
 	EReference getTable_ColumnAxisProvidersHistory();

 

 	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Row Axis Providers History</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory()

 	 * @see #getTable()

@@ -406,12 +366,9 @@ public interface NattablePackage extends EPackage {
 	EReference getTable_RowAxisProvidersHistory();

 

 	/**

-	 * Returns the meta object for the containment reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}

-	 * '.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference '<em>Local Row Header Axis Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration()

 	 * @see #getTable()

@@ -420,12 +377,9 @@ public interface NattablePackage extends EPackage {
 	EReference getTable_LocalRowHeaderAxisConfiguration();

 

 	/**

-	 * Returns the meta object for the containment reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration

-	 * <em>Local Column Header Axis Configuration</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference '<em>Local Column Header Axis Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration()

 	 * @see #getTable()

@@ -434,11 +388,9 @@ public interface NattablePackage extends EPackage {
 	EReference getTable_LocalColumnHeaderAxisConfiguration();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider

-	 * <em>Current Row Axis Provider</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Current Row Axis Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider()

 	 * @see #getTable()

@@ -447,11 +399,9 @@ public interface NattablePackage extends EPackage {
 	EReference getTable_CurrentRowAxisProvider();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider

-	 * <em>Current Column Axis Provider</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Current Column Axis Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider()

 	 * @see #getTable()

@@ -460,11 +410,9 @@ public interface NattablePackage extends EPackage {
 	EReference getTable_CurrentColumnAxisProvider();

 

 	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells

-	 * <em>Cells</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Cells</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells()

 	 * @see #getTable()

@@ -476,7 +424,6 @@ public interface NattablePackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -493,7 +440,6 @@ public interface NattablePackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -502,7 +448,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()

 		 * @generated

@@ -513,7 +458,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Context</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE__CONTEXT = eINSTANCE.getTable_Context();

@@ -522,7 +466,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owner</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE__OWNER = eINSTANCE.getTable_Owner();

@@ -531,7 +474,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Prototype</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE__PROTOTYPE = eINSTANCE.getTable_Prototype();

@@ -540,7 +482,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Table Configuration</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE__TABLE_CONFIGURATION = eINSTANCE.getTable_TableConfiguration();

@@ -549,7 +490,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Invert Axis</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute TABLE__INVERT_AXIS = eINSTANCE.getTable_InvertAxis();

@@ -558,7 +498,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Column Axis Providers History</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE__COLUMN_AXIS_PROVIDERS_HISTORY = eINSTANCE.getTable_ColumnAxisProvidersHistory();

@@ -567,7 +506,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Row Axis Providers History</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE__ROW_AXIS_PROVIDERS_HISTORY = eINSTANCE.getTable_RowAxisProvidersHistory();

@@ -576,7 +514,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

@@ -585,7 +522,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

@@ -594,7 +530,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Current Row Axis Provider</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE__CURRENT_ROW_AXIS_PROVIDER = eINSTANCE.getTable_CurrentRowAxisProvider();

@@ -603,7 +538,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Current Column Axis Provider</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE__CURRENT_COLUMN_AXIS_PROVIDER = eINSTANCE.getTable_CurrentColumnAxisProvider();

@@ -612,7 +546,6 @@ public interface NattablePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Cells</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE__CELLS = eINSTANCE.getTable_Cells();

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
index 6bc748e0a01..ec20d65c9de 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
@@ -27,36 +27,31 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
  *

  * <!-- begin-model-doc -->

  * This object represents the table. It is used to save the interesting informations of the graphical table.

- *

+ * 

  * The currentAxisProviders can be : Master/Master, Master/Slave, Slave/Master and never Slave/Slave.

  * <!-- end-model-doc -->

  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner <em>Owner</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}

- * </li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration

- * </em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</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#getOwner <em>Owner</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable()

- * @model

- *        annotation=

- *        "http://www.eclipse.org/emf/2002/Ecore constraints='currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes'"

- *        annotation=

- *        "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot currentRowAxisInHistory='rowAxisProvidersHistory->includes(currentRowAxisProvider)' currentColumnAxisInHistory='columnAxisProvidersHistory->includes(currentColumnAxisProvider)' currentAxisProvidersTypes='not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"

+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes'"

+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot currentRowAxisInHistory='rowAxisProvidersHistory->includes(currentRowAxisProvider)' currentColumnAxisInHistory='columnAxisProvidersHistory->includes(currentColumnAxisProvider)' currentAxisProvidersTypes='not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"

  * @generated

  */

 public interface Table extends TableNamedElement {

@@ -66,14 +61,12 @@ public interface Table extends TableNamedElement {
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * <!-- begin-model-doc -->

-	 * The context is used for two things :

-	 * <ul>

-	 * <li>"virtual" parent to display the table in the Papyrus Model Explorer</li>

+	 * The context is used for two things : 

+	 * <ul> <li>"virtual" parent to display the table in the Papyrus Model Explorer </li>

 	 * <li>container of the objects created in the table</li>

-	 * </ul>

+	 * </ul> 

 	 * The context can't be null;

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Context</em>' reference.

 	 * @see #setContext(EObject)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Context()

@@ -86,9 +79,7 @@ public interface Table extends TableNamedElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Context</em>' reference.

+	 * @param value the new value of the '<em>Context</em>' reference.

 	 * @see #getContext()

 	 * @generated

 	 */

@@ -101,7 +92,6 @@ public interface Table extends TableNamedElement {
 	 * If the meaning of the '<em>Owner</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Owner</em>' reference.

 	 * @see #setOwner(EObject)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Owner()

@@ -114,9 +104,7 @@ public interface Table extends TableNamedElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getOwner <em>Owner</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Owner</em>' reference.

+	 * @param value the new value of the '<em>Owner</em>' reference.

 	 * @see #getOwner()

 	 * @generated

 	 */

@@ -129,7 +117,6 @@ public interface Table extends TableNamedElement {
 	 * If the meaning of the '<em>Prototype</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Prototype</em>' reference.

 	 * @see #setPrototype(EObject)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Prototype()

@@ -142,9 +129,7 @@ public interface Table extends TableNamedElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getPrototype <em>Prototype</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Prototype</em>' reference.

+	 * @param value the new value of the '<em>Prototype</em>' reference.

 	 * @see #getPrototype()

 	 * @generated

 	 */

@@ -157,7 +142,6 @@ public interface Table extends TableNamedElement {
 	 * <!-- begin-model-doc -->

 	 * Reference the configuration used by the table. This field can't be null.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Table Configuration</em>' reference.

 	 * @see #setTableConfiguration(TableConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_TableConfiguration()

@@ -167,13 +151,10 @@ public interface Table extends TableNamedElement {
 	TableConfiguration getTableConfiguration();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}'

-	 * reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Table Configuration</em>' reference.

+	 * @param value the new value of the '<em>Table Configuration</em>' reference.

 	 * @see #getTableConfiguration()

 	 * @generated

 	 */

@@ -185,10 +166,9 @@ public interface Table extends TableNamedElement {
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * <!-- begin-model-doc -->

-	 * If true, the axis will be inverted on the screen. When the user inverts the axis,

+	 * If true, the axis will be inverted on the screen. When the user inverts the axis, 

 	 * only this boolean is changed. We must not invert the currentRowAxis and the currentColumnAxis neither the histories or the AxisConfiguration

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Invert Axis</em>' attribute.

 	 * @see #setInvertAxis(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_InvertAxis()

@@ -201,9 +181,7 @@ public interface Table extends TableNamedElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Invert Axis</em>' attribute.

+	 * @param value the new value of the '<em>Invert Axis</em>' attribute.

 	 * @see #isInvertAxis()

 	 * @generated

 	 */

@@ -217,7 +195,6 @@ public interface Table extends TableNamedElement {
 	 * <!-- begin-model-doc -->

 	 * This list contains all the columns configurations already used by the user and saved in this list by him.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Column Axis Providers History</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_ColumnAxisProvidersHistory()

 	 * @model containment="true" required="true"

@@ -233,7 +210,6 @@ public interface Table extends TableNamedElement {
 	 * <!-- begin-model-doc -->

 	 * This list contains all the rowsconfigurations already used by the user and saved in this list by him.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Row Axis Providers History</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_RowAxisProvidersHistory()

 	 * @model containment="true" required="true"

@@ -246,10 +222,9 @@ public interface Table extends TableNamedElement {
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * <!-- begin-model-doc -->

-	 * This field contains the row headerAxisConfiguration. It could be null.

+	 * This field contains the row headerAxisConfiguration. It could be null. 

 	 * In this case we use the row TableHeaderAxisConfiguration stored in the TableConfiguration of this table.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Local Row Header Axis Configuration</em>' containment reference.

 	 * @see #setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_LocalRowHeaderAxisConfiguration()

@@ -259,13 +234,10 @@ public interface Table extends TableNamedElement {
 	LocalTableHeaderAxisConfiguration getLocalRowHeaderAxisConfiguration();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration

-	 * <em>Local Row Header Axis Configuration</em>}' containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Local Row Header Axis Configuration</em>' containment reference.

+	 * @param value the new value of the '<em>Local Row Header Axis Configuration</em>' containment reference.

 	 * @see #getLocalRowHeaderAxisConfiguration()

 	 * @generated

 	 */

@@ -276,10 +248,9 @@ public interface Table extends TableNamedElement {
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * <!-- begin-model-doc -->

-	 * This field contains the columnheaderAxisConfiguration. It could be null.

+	 * This field contains the columnheaderAxisConfiguration. It could be null. 

 	 * In this case we use the column TableHeaderAxisConfiguration stored in the TableConfiguration of this table.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Local Column Header Axis Configuration</em>' containment reference.

 	 * @see #setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_LocalColumnHeaderAxisConfiguration()

@@ -289,13 +260,10 @@ public interface Table extends TableNamedElement {
 	LocalTableHeaderAxisConfiguration getLocalColumnHeaderAxisConfiguration();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration

-	 * <em>Local Column Header Axis Configuration</em>}' containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Local Column Header Axis Configuration</em>' containment reference.

+	 * @param value the new value of the '<em>Local Column Header Axis Configuration</em>' containment reference.

 	 * @see #getLocalColumnHeaderAxisConfiguration()

 	 * @generated

 	 */

@@ -309,7 +277,6 @@ public interface Table extends TableNamedElement {
 	 * References the current row AxisProvider used in the table.

 	 * The value must be owned by rowAxisProviderHistory

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Current Row Axis Provider</em>' reference.

 	 * @see #setCurrentRowAxisProvider(AbstractAxisProvider)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_CurrentRowAxisProvider()

@@ -319,13 +286,10 @@ public interface Table extends TableNamedElement {
 	AbstractAxisProvider getCurrentRowAxisProvider();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider

-	 * <em>Current Row Axis Provider</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Current Row Axis Provider</em>' reference.

+	 * @param value the new value of the '<em>Current Row Axis Provider</em>' reference.

 	 * @see #getCurrentRowAxisProvider()

 	 * @generated

 	 */

@@ -339,7 +303,6 @@ public interface Table extends TableNamedElement {
 	 * References the current column AxisProvider used in the table.

 	 * The value must be owned by column AxisProviderHistory

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Current Column Axis Provider</em>' reference.

 	 * @see #setCurrentColumnAxisProvider(AbstractAxisProvider)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_CurrentColumnAxisProvider()

@@ -349,13 +312,10 @@ public interface Table extends TableNamedElement {
 	AbstractAxisProvider getCurrentColumnAxisProvider();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider

-	 * <em>Current Column Axis Provider</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Current Column Axis Provider</em>' reference.

+	 * @param value the new value of the '<em>Current Column Axis Provider</em>' reference.

 	 * @see #getCurrentColumnAxisProvider()

 	 * @generated

 	 */

@@ -370,7 +330,6 @@ public interface Table extends TableNamedElement {
 	 * Cells of the table. They are used when the value to display can't be deduced of

 	 * the intersection of the row and the column.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Cells</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Cells()

 	 * @model containment="true"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
index 21efcd37bc6..668c842a833 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
@@ -25,7 +25,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory {

@@ -34,16 +33,16 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static NattableFactory init() {

 		try {

 			NattableFactory theNattableFactory = (NattableFactory)EPackage.Registry.INSTANCE.getEFactory(NattablePackage.eNS_URI);

-			if(theNattableFactory != null) {

+			if (theNattableFactory != null) {

 				return theNattableFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new NattableFactoryImpl();

@@ -53,7 +52,6 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableFactoryImpl() {

@@ -63,23 +61,20 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

-		case NattablePackage.TABLE:

-			return createTable();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eClass.getClassifierID()) {

+			case NattablePackage.TABLE: return createTable();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -91,7 +86,6 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -102,7 +96,6 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
index 764063d8721..9c47db2b3db 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
@@ -46,7 +46,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableValidator;
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattablePackageImpl extends EPackageImpl implements NattablePackage {

@@ -54,19 +53,19 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass tableEClass = null;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

 	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#eNS_URI

 	 * @see #init()

@@ -79,32 +78,32 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link NattablePackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * 

+	 * <p>This method is used to initialize {@link NattablePackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static NattablePackage init() {

-		if(isInited) {

-			return (NattablePackage)EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI);

-		}

+		if (isInited) return (NattablePackage)EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI);

+

 		// Obtain or create and register package

 		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablePackageImpl());

+

 		isInited = true;

+

 		// Initialize simple dependencies

 		EcorePackage.eINSTANCE.eClass();

+

 		// Obtain or create and register interdependencies

 		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

 		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

@@ -115,6 +114,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

 		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

 		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

+

 		// Create package meta-data objects

 		theNattablePackage.createPackageContents();

 		theNattableconfigurationPackage.createPackageContents();

@@ -126,6 +126,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 		theNattablecellPackage.createPackageContents();

 		theNattableproblemPackage.createPackageContents();

 		theNattablestylePackage.createPackageContents();

+

 		// Initialize created meta-data

 		theNattablePackage.initializePackageContents();

 		theNattableconfigurationPackage.initializePackageContents();

@@ -137,16 +138,20 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 		theNattablecellPackage.initializePackageContents();

 		theNattableproblemPackage.initializePackageContents();

 		theNattablestylePackage.initializePackageContents();

+

 		// Register package validator

-		EValidator.Registry.INSTANCE.put(theNattablePackage, new EValidator.Descriptor() {

+		EValidator.Registry.INSTANCE.put

+			(theNattablePackage, 

+			 new EValidator.Descriptor() {

+				 public EValidator getEValidator() {

+					 return NattableValidator.INSTANCE;

+				 }

+			 });

 

-			@Override

-			public EValidator getEValidator() {

-				return NattableValidator.INSTANCE;

-			}

-		});

 		// Mark meta-data to indicate it can't be changed

 		theNattablePackage.freeze();

+

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(NattablePackage.eNS_URI, theNattablePackage);

 		return theNattablePackage;

@@ -155,7 +160,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -166,7 +170,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -177,7 +180,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -188,7 +190,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -199,7 +200,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -210,7 +210,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -221,7 +220,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -232,7 +230,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -243,7 +240,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -254,7 +250,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -265,7 +260,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -276,7 +270,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -287,7 +280,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -298,7 +290,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -309,24 +300,21 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package. This method is

+	 * Creates the meta-model objects for the package.  This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated) {

-			return;

-		}

+		if (isCreated) return;

 		isCreated = true;

+

 		// Create classes and their features

 		tableEClass = createEClass(TABLE);

 		createEReference(tableEClass, TABLE__CONTEXT);

@@ -346,28 +334,26 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model. This

+	 * Complete the initialization of the package and its meta-model.  This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized) {

-			return;

-		}

+		if (isInitialized) return;

 		isInitialized = true;

+

 		// Initialize package

 		setName(eNAME);

 		setNsPrefix(eNS_PREFIX);

 		setNsURI(eNS_URI);

+

 		// Obtain other dependent packages

 		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

 		NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);

@@ -378,6 +364,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 		NattablecellPackage theNattablecellPackage = (NattablecellPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);

 		NattableproblemPackage theNattableproblemPackage = (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);

 		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

+

 		// Add subpackages

 		getESubpackages().add(theNattableconfigurationPackage);

 		getESubpackages().add(theNattableaxisproviderPackage);

@@ -388,10 +375,14 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 		getESubpackages().add(theNattablecellPackage);

 		getESubpackages().add(theNattableproblemPackage);

 		getESubpackages().add(theNattablestylePackage);

+

 		// Create type parameters

+

 		// Set bounds for type parameters

+

 		// Add supertypes to classes

 		tableEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());

+

 		// Initialize classes, features, and operations; add parameters

 		initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getTable_Context(), ecorePackage.getEObject(), null, "context", null, 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$

@@ -406,8 +397,10 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 		initEReference(getTable_CurrentRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentRowAxisProvider", 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_CurrentColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentColumnAxisProvider", 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_Cells(), theNattablecellPackage.getCell(), null, "cells", 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$

+

 		// Create resource

 		createResource(eNS_URI);

+

 		// Create annotations

 		// http://www.eclipse.org/OCL/Import

 		createImportAnnotations();

@@ -421,44 +414,57 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	 * Initializes the annotations for <b>http://www.eclipse.org/OCL/Import</b>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void createImportAnnotations() {

-		String source = "http://www.eclipse.org/OCL/Import"; //$NON-NLS-1$

-		addAnnotation(this, source, new String[]{ "ecore", "http://www.eclipse.org/emf/2002/Ecore#/" //$NON-NLS-1$ //$NON-NLS-2$

-		});

+		String source = "http://www.eclipse.org/OCL/Import"; //$NON-NLS-1$	

+		addAnnotation

+		  (this, 

+		   source, 

+		   new String[] {

+			 "ecore", "http://www.eclipse.org/emf/2002/Ecore#/" //$NON-NLS-1$ //$NON-NLS-2$

+		   });

 	}

 

 	/**

 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void createEcoreAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$

-		addAnnotation(this, source, new String[]{ "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-		"settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-		"validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$

-		});

-		addAnnotation(tableEClass, source, new String[]{ "constraints", "currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes" //$NON-NLS-1$ //$NON-NLS-2$

-		});

+		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$	

+		addAnnotation

+		  (this, 

+		   source, 

+		   new String[] {

+			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

+			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

+			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$

+		   });	

+		addAnnotation

+		  (tableEClass, 

+		   source, 

+		   new String[] {

+			 "constraints", "currentRowAxisInHistory currentColumnAxisInHistory currentAxisProvidersTypes" //$NON-NLS-1$ //$NON-NLS-2$

+		   });

 	}

 

 	/**

 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void createPivotAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$

-		addAnnotation(tableEClass, source, new String[]{ "currentRowAxisInHistory", "rowAxisProvidersHistory->includes(currentRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

-		"currentColumnAxisInHistory", "columnAxisProvidersHistory->includes(currentColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

-		"currentAxisProvidersTypes", "not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$

-		});

+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$	

+		addAnnotation

+		  (tableEClass, 

+		   source, 

+		   new String[] {

+			 "currentRowAxisInHistory", "rowAxisProvidersHistory->includes(currentRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

+			 "currentColumnAxisInHistory", "columnAxisProvidersHistory->includes(currentColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

+			 "currentAxisProvidersTypes", "not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$

+		   });

 	}

 } // NattablePackageImpl

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
index f5d325d713b..33c5d68934b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
@@ -37,23 +37,21 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.i
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getContext <em>Context</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getOwner <em>Owner</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getPrototype <em>Prototype</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getTableConfiguration <em>Table Configuration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#isInvertAxis <em>Invert Axis</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis

- * Configuration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis

- * Configuration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCells <em>Cells</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#getOwner <em>Owner</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getPrototype <em>Prototype</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getTableConfiguration <em>Table Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#isInvertAxis <em>Invert Axis</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getColumnAxisProvidersHistory <em>Column Axis Providers History</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getRowAxisProvidersHistory <em>Row Axis Providers History</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCells <em>Cells</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -63,7 +61,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The cached value of the '{@link #getContext() <em>Context</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getContext()

 	 * @generated

 	 * @ordered

@@ -74,7 +71,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getOwner()

 	 * @generated

 	 * @ordered

@@ -85,7 +81,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The cached value of the '{@link #getPrototype() <em>Prototype</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getPrototype()

 	 * @generated

 	 * @ordered

@@ -96,7 +91,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The cached value of the '{@link #getTableConfiguration() <em>Table Configuration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getTableConfiguration()

 	 * @generated

 	 * @ordered

@@ -107,7 +101,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The default value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isInvertAxis()

 	 * @generated

 	 * @ordered

@@ -118,7 +111,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The cached value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isInvertAxis()

 	 * @generated

 	 * @ordered

@@ -129,7 +121,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The cached value of the '{@link #getColumnAxisProvidersHistory() <em>Column Axis Providers History</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getColumnAxisProvidersHistory()

 	 * @generated

 	 * @ordered

@@ -140,7 +131,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The cached value of the '{@link #getRowAxisProvidersHistory() <em>Row Axis Providers History</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getRowAxisProvidersHistory()

 	 * @generated

 	 * @ordered

@@ -151,7 +141,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The cached value of the '{@link #getLocalRowHeaderAxisConfiguration() <em>Local Row Header Axis Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLocalRowHeaderAxisConfiguration()

 	 * @generated

 	 * @ordered

@@ -159,11 +148,9 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	protected LocalTableHeaderAxisConfiguration localRowHeaderAxisConfiguration;

 

 	/**

-	 * The cached value of the '{@link #getLocalColumnHeaderAxisConfiguration() <em>Local Column Header Axis Configuration</em>}' containment

-	 * reference.

+	 * The cached value of the '{@link #getLocalColumnHeaderAxisConfiguration() <em>Local Column Header Axis Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLocalColumnHeaderAxisConfiguration()

 	 * @generated

 	 * @ordered

@@ -174,7 +161,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The cached value of the '{@link #getCurrentRowAxisProvider() <em>Current Row Axis Provider</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getCurrentRowAxisProvider()

 	 * @generated

 	 * @ordered

@@ -185,7 +171,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The cached value of the '{@link #getCurrentColumnAxisProvider() <em>Current Column Axis Provider</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getCurrentColumnAxisProvider()

 	 * @generated

 	 * @ordered

@@ -196,7 +181,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	 * The cached value of the '{@link #getCells() <em>Cells</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getCells()

 	 * @generated

 	 * @ordered

@@ -206,7 +190,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected TableImpl() {

@@ -216,7 +199,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -227,18 +209,16 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject getContext() {

-		if(context != null && context.eIsProxy()) {

+		if (context != null && context.eIsProxy()) {

 			InternalEObject oldContext = (InternalEObject)context;

 			context = eResolveProxy(oldContext);

-			if(context != oldContext) {

-				if(eNotificationRequired()) {

+			if (context != oldContext) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CONTEXT, oldContext, context));

-				}

 			}

 		}

 		return context;

@@ -247,7 +227,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EObject basicGetContext() {

@@ -257,33 +236,29 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setContext(EObject newContext) {

 		EObject oldContext = context;

 		context = newContext;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CONTEXT, oldContext, context));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject getOwner() {

-		if(owner != null && owner.eIsProxy()) {

+		if (owner != null && owner.eIsProxy()) {

 			InternalEObject oldOwner = (InternalEObject)owner;

 			owner = eResolveProxy(oldOwner);

-			if(owner != oldOwner) {

-				if(eNotificationRequired()) {

+			if (owner != oldOwner) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__OWNER, oldOwner, owner));

-				}

 			}

 		}

 		return owner;

@@ -292,7 +267,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EObject basicGetOwner() {

@@ -302,33 +276,29 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setOwner(EObject newOwner) {

 		EObject oldOwner = owner;

 		owner = newOwner;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__OWNER, oldOwner, owner));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject getPrototype() {

-		if(prototype != null && prototype.eIsProxy()) {

+		if (prototype != null && prototype.eIsProxy()) {

 			InternalEObject oldPrototype = (InternalEObject)prototype;

 			prototype = eResolveProxy(oldPrototype);

-			if(prototype != oldPrototype) {

-				if(eNotificationRequired()) {

+			if (prototype != oldPrototype) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__PROTOTYPE, oldPrototype, prototype));

-				}

 			}

 		}

 		return prototype;

@@ -337,7 +307,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EObject basicGetPrototype() {

@@ -347,33 +316,29 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setPrototype(EObject newPrototype) {

 		EObject oldPrototype = prototype;

 		prototype = newPrototype;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__PROTOTYPE, oldPrototype, prototype));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public TableConfiguration getTableConfiguration() {

-		if(tableConfiguration != null && tableConfiguration.eIsProxy()) {

+		if (tableConfiguration != null && tableConfiguration.eIsProxy()) {

 			InternalEObject oldTableConfiguration = (InternalEObject)tableConfiguration;

 			tableConfiguration = (TableConfiguration)eResolveProxy(oldTableConfiguration);

-			if(tableConfiguration != oldTableConfiguration) {

-				if(eNotificationRequired()) {

+			if (tableConfiguration != oldTableConfiguration) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));

-				}

 			}

 		}

 		return tableConfiguration;

@@ -382,7 +347,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public TableConfiguration basicGetTableConfiguration() {

@@ -392,22 +356,19 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setTableConfiguration(TableConfiguration newTableConfiguration) {

 		TableConfiguration oldTableConfiguration = tableConfiguration;

 		tableConfiguration = newTableConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__TABLE_CONFIGURATION, oldTableConfiguration, tableConfiguration));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -418,27 +379,24 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setInvertAxis(boolean newInvertAxis) {

 		boolean oldInvertAxis = invertAxis;

 		invertAxis = newInvertAxis;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__INVERT_AXIS, oldInvertAxis, invertAxis));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<AbstractAxisProvider> getColumnAxisProvidersHistory() {

-		if(columnAxisProvidersHistory == null) {

+		if (columnAxisProvidersHistory == null) {

 			columnAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY);

 		}

 		return columnAxisProvidersHistory;

@@ -447,12 +405,11 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<AbstractAxisProvider> getRowAxisProvidersHistory() {

-		if(rowAxisProvidersHistory == null) {

+		if (rowAxisProvidersHistory == null) {

 			rowAxisProvidersHistory = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY);

 		}

 		return rowAxisProvidersHistory;

@@ -461,7 +418,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -472,19 +428,14 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration, NotificationChain msgs) {

 		LocalTableHeaderAxisConfiguration oldLocalRowHeaderAxisConfiguration = localRowHeaderAxisConfiguration;

 		localRowHeaderAxisConfiguration = newLocalRowHeaderAxisConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, oldLocalRowHeaderAxisConfiguration, newLocalRowHeaderAxisConfiguration);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -492,32 +443,26 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalRowHeaderAxisConfiguration) {

-		if(newLocalRowHeaderAxisConfiguration != localRowHeaderAxisConfiguration) {

+		if (newLocalRowHeaderAxisConfiguration != localRowHeaderAxisConfiguration) {

 			NotificationChain msgs = null;

-			if(localRowHeaderAxisConfiguration != null) {

+			if (localRowHeaderAxisConfiguration != null)

 				msgs = ((InternalEObject)localRowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);

-			}

-			if(newLocalRowHeaderAxisConfiguration != null) {

+			if (newLocalRowHeaderAxisConfiguration != null)

 				msgs = ((InternalEObject)newLocalRowHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, null, msgs);

-			}

 			msgs = basicSetLocalRowHeaderAxisConfiguration(newLocalRowHeaderAxisConfiguration, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, newLocalRowHeaderAxisConfiguration, newLocalRowHeaderAxisConfiguration));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION, newLocalRowHeaderAxisConfiguration, newLocalRowHeaderAxisConfiguration));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -528,19 +473,14 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration, NotificationChain msgs) {

 		LocalTableHeaderAxisConfiguration oldLocalColumnHeaderAxisConfiguration = localColumnHeaderAxisConfiguration;

 		localColumnHeaderAxisConfiguration = newLocalColumnHeaderAxisConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, oldLocalColumnHeaderAxisConfiguration, newLocalColumnHeaderAxisConfiguration);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -548,43 +488,36 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration newLocalColumnHeaderAxisConfiguration) {

-		if(newLocalColumnHeaderAxisConfiguration != localColumnHeaderAxisConfiguration) {

+		if (newLocalColumnHeaderAxisConfiguration != localColumnHeaderAxisConfiguration) {

 			NotificationChain msgs = null;

-			if(localColumnHeaderAxisConfiguration != null) {

+			if (localColumnHeaderAxisConfiguration != null)

 				msgs = ((InternalEObject)localColumnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);

-			}

-			if(newLocalColumnHeaderAxisConfiguration != null) {

+			if (newLocalColumnHeaderAxisConfiguration != null)

 				msgs = ((InternalEObject)newLocalColumnHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);

-			}

 			msgs = basicSetLocalColumnHeaderAxisConfiguration(newLocalColumnHeaderAxisConfiguration, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, newLocalColumnHeaderAxisConfiguration, newLocalColumnHeaderAxisConfiguration));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION, newLocalColumnHeaderAxisConfiguration, newLocalColumnHeaderAxisConfiguration));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public AbstractAxisProvider getCurrentRowAxisProvider() {

-		if(currentRowAxisProvider != null && currentRowAxisProvider.eIsProxy()) {

+		if (currentRowAxisProvider != null && currentRowAxisProvider.eIsProxy()) {

 			InternalEObject oldCurrentRowAxisProvider = (InternalEObject)currentRowAxisProvider;

 			currentRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentRowAxisProvider);

-			if(currentRowAxisProvider != oldCurrentRowAxisProvider) {

-				if(eNotificationRequired()) {

+			if (currentRowAxisProvider != oldCurrentRowAxisProvider) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER, oldCurrentRowAxisProvider, currentRowAxisProvider));

-				}

 			}

 		}

 		return currentRowAxisProvider;

@@ -593,7 +526,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public AbstractAxisProvider basicGetCurrentRowAxisProvider() {

@@ -603,33 +535,29 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setCurrentRowAxisProvider(AbstractAxisProvider newCurrentRowAxisProvider) {

 		AbstractAxisProvider oldCurrentRowAxisProvider = currentRowAxisProvider;

 		currentRowAxisProvider = newCurrentRowAxisProvider;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER, oldCurrentRowAxisProvider, currentRowAxisProvider));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public AbstractAxisProvider getCurrentColumnAxisProvider() {

-		if(currentColumnAxisProvider != null && currentColumnAxisProvider.eIsProxy()) {

+		if (currentColumnAxisProvider != null && currentColumnAxisProvider.eIsProxy()) {

 			InternalEObject oldCurrentColumnAxisProvider = (InternalEObject)currentColumnAxisProvider;

 			currentColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldCurrentColumnAxisProvider);

-			if(currentColumnAxisProvider != oldCurrentColumnAxisProvider) {

-				if(eNotificationRequired()) {

+			if (currentColumnAxisProvider != oldCurrentColumnAxisProvider) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER, oldCurrentColumnAxisProvider, currentColumnAxisProvider));

-				}

 			}

 		}

 		return currentColumnAxisProvider;

@@ -638,7 +566,6 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public AbstractAxisProvider basicGetCurrentColumnAxisProvider() {

@@ -648,27 +575,24 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setCurrentColumnAxisProvider(AbstractAxisProvider newCurrentColumnAxisProvider) {

 		AbstractAxisProvider oldCurrentColumnAxisProvider = currentColumnAxisProvider;

 		currentColumnAxisProvider = newCurrentColumnAxisProvider;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER, oldCurrentColumnAxisProvider, currentColumnAxisProvider));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<Cell> getCells() {

-		if(cells == null) {

+		if (cells == null) {

 			cells = new EObjectContainmentEList<Cell>(Cell.class, this, NattablePackage.TABLE__CELLS);

 		}

 		return cells;

@@ -677,22 +601,21 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-			return ((InternalEList<?>)getColumnAxisProvidersHistory()).basicRemove(otherEnd, msgs);

-		case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-			return ((InternalEList<?>)getRowAxisProvidersHistory()).basicRemove(otherEnd, msgs);

-		case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-			return basicSetLocalRowHeaderAxisConfiguration(null, msgs);

-		case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-			return basicSetLocalColumnHeaderAxisConfiguration(null, msgs);

-		case NattablePackage.TABLE__CELLS:

-			return ((InternalEList<?>)getCells()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

+				return ((InternalEList<?>)getColumnAxisProvidersHistory()).basicRemove(otherEnd, msgs);

+			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

+				return ((InternalEList<?>)getRowAxisProvidersHistory()).basicRemove(otherEnd, msgs);

+			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

+				return basicSetLocalRowHeaderAxisConfiguration(null, msgs);

+			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

+				return basicSetLocalColumnHeaderAxisConfiguration(null, msgs);

+			case NattablePackage.TABLE__CELLS:

+				return ((InternalEList<?>)getCells()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -700,54 +623,41 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablePackage.TABLE__CONTEXT:

-			if(resolve) {

-				return getContext();

-			}

-			return basicGetContext();

-		case NattablePackage.TABLE__OWNER:

-			if(resolve) {

-				return getOwner();

-			}

-			return basicGetOwner();

-		case NattablePackage.TABLE__PROTOTYPE:

-			if(resolve) {

-				return getPrototype();

-			}

-			return basicGetPrototype();

-		case NattablePackage.TABLE__TABLE_CONFIGURATION:

-			if(resolve) {

-				return getTableConfiguration();

-			}

-			return basicGetTableConfiguration();

-		case NattablePackage.TABLE__INVERT_AXIS:

-			return isInvertAxis();

-		case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-			return getColumnAxisProvidersHistory();

-		case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-			return getRowAxisProvidersHistory();

-		case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-			return getLocalRowHeaderAxisConfiguration();

-		case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-			return getLocalColumnHeaderAxisConfiguration();

-		case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

-			if(resolve) {

-				return getCurrentRowAxisProvider();

-			}

-			return basicGetCurrentRowAxisProvider();

-		case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

-			if(resolve) {

-				return getCurrentColumnAxisProvider();

-			}

-			return basicGetCurrentColumnAxisProvider();

-		case NattablePackage.TABLE__CELLS:

-			return getCells();

+		switch (featureID) {

+			case NattablePackage.TABLE__CONTEXT:

+				if (resolve) return getContext();

+				return basicGetContext();

+			case NattablePackage.TABLE__OWNER:

+				if (resolve) return getOwner();

+				return basicGetOwner();

+			case NattablePackage.TABLE__PROTOTYPE:

+				if (resolve) return getPrototype();

+				return basicGetPrototype();

+			case NattablePackage.TABLE__TABLE_CONFIGURATION:

+				if (resolve) return getTableConfiguration();

+				return basicGetTableConfiguration();

+			case NattablePackage.TABLE__INVERT_AXIS:

+				return isInvertAxis();

+			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

+				return getColumnAxisProvidersHistory();

+			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

+				return getRowAxisProvidersHistory();

+			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

+				return getLocalRowHeaderAxisConfiguration();

+			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

+				return getLocalColumnHeaderAxisConfiguration();

+			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

+				if (resolve) return getCurrentRowAxisProvider();

+				return basicGetCurrentRowAxisProvider();

+			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

+				if (resolve) return getCurrentColumnAxisProvider();

+				return basicGetCurrentColumnAxisProvider();

+			case NattablePackage.TABLE__CELLS:

+				return getCells();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -755,52 +665,51 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablePackage.TABLE__CONTEXT:

-			setContext((EObject)newValue);

-			return;

-		case NattablePackage.TABLE__OWNER:

-			setOwner((EObject)newValue);

-			return;

-		case NattablePackage.TABLE__PROTOTYPE:

-			setPrototype((EObject)newValue);

-			return;

-		case NattablePackage.TABLE__TABLE_CONFIGURATION:

-			setTableConfiguration((TableConfiguration)newValue);

-			return;

-		case NattablePackage.TABLE__INVERT_AXIS:

-			setInvertAxis((Boolean)newValue);

-			return;

-		case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-			getColumnAxisProvidersHistory().clear();

-			getColumnAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>)newValue);

-			return;

-		case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-			getRowAxisProvidersHistory().clear();

-			getRowAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>)newValue);

-			return;

-		case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-			setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)newValue);

-			return;

-		case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-			setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)newValue);

-			return;

-		case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

-			setCurrentRowAxisProvider((AbstractAxisProvider)newValue);

-			return;

-		case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

-			setCurrentColumnAxisProvider((AbstractAxisProvider)newValue);

-			return;

-		case NattablePackage.TABLE__CELLS:

-			getCells().clear();

-			getCells().addAll((Collection<? extends Cell>)newValue);

-			return;

+		switch (featureID) {

+			case NattablePackage.TABLE__CONTEXT:

+				setContext((EObject)newValue);

+				return;

+			case NattablePackage.TABLE__OWNER:

+				setOwner((EObject)newValue);

+				return;

+			case NattablePackage.TABLE__PROTOTYPE:

+				setPrototype((EObject)newValue);

+				return;

+			case NattablePackage.TABLE__TABLE_CONFIGURATION:

+				setTableConfiguration((TableConfiguration)newValue);

+				return;

+			case NattablePackage.TABLE__INVERT_AXIS:

+				setInvertAxis((Boolean)newValue);

+				return;

+			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

+				getColumnAxisProvidersHistory().clear();

+				getColumnAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>)newValue);

+				return;

+			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

+				getRowAxisProvidersHistory().clear();

+				getRowAxisProvidersHistory().addAll((Collection<? extends AbstractAxisProvider>)newValue);

+				return;

+			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

+				setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)newValue);

+				return;

+			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

+				setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)newValue);

+				return;

+			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

+				setCurrentRowAxisProvider((AbstractAxisProvider)newValue);

+				return;

+			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

+				setCurrentColumnAxisProvider((AbstractAxisProvider)newValue);

+				return;

+			case NattablePackage.TABLE__CELLS:

+				getCells().clear();

+				getCells().addAll((Collection<? extends Cell>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -808,48 +717,47 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablePackage.TABLE__CONTEXT:

-			setContext((EObject)null);

-			return;

-		case NattablePackage.TABLE__OWNER:

-			setOwner((EObject)null);

-			return;

-		case NattablePackage.TABLE__PROTOTYPE:

-			setPrototype((EObject)null);

-			return;

-		case NattablePackage.TABLE__TABLE_CONFIGURATION:

-			setTableConfiguration((TableConfiguration)null);

-			return;

-		case NattablePackage.TABLE__INVERT_AXIS:

-			setInvertAxis(INVERT_AXIS_EDEFAULT);

-			return;

-		case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-			getColumnAxisProvidersHistory().clear();

-			return;

-		case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-			getRowAxisProvidersHistory().clear();

-			return;

-		case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-			setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)null);

-			return;

-		case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-			setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)null);

-			return;

-		case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

-			setCurrentRowAxisProvider((AbstractAxisProvider)null);

-			return;

-		case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

-			setCurrentColumnAxisProvider((AbstractAxisProvider)null);

-			return;

-		case NattablePackage.TABLE__CELLS:

-			getCells().clear();

-			return;

+		switch (featureID) {

+			case NattablePackage.TABLE__CONTEXT:

+				setContext((EObject)null);

+				return;

+			case NattablePackage.TABLE__OWNER:

+				setOwner((EObject)null);

+				return;

+			case NattablePackage.TABLE__PROTOTYPE:

+				setPrototype((EObject)null);

+				return;

+			case NattablePackage.TABLE__TABLE_CONFIGURATION:

+				setTableConfiguration((TableConfiguration)null);

+				return;

+			case NattablePackage.TABLE__INVERT_AXIS:

+				setInvertAxis(INVERT_AXIS_EDEFAULT);

+				return;

+			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

+				getColumnAxisProvidersHistory().clear();

+				return;

+			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

+				getRowAxisProvidersHistory().clear();

+				return;

+			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

+				setLocalRowHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)null);

+				return;

+			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

+				setLocalColumnHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)null);

+				return;

+			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

+				setCurrentRowAxisProvider((AbstractAxisProvider)null);

+				return;

+			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

+				setCurrentColumnAxisProvider((AbstractAxisProvider)null);

+				return;

+			case NattablePackage.TABLE__CELLS:

+				getCells().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -857,36 +765,35 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablePackage.TABLE__CONTEXT:

-			return context != null;

-		case NattablePackage.TABLE__OWNER:

-			return owner != null;

-		case NattablePackage.TABLE__PROTOTYPE:

-			return prototype != null;

-		case NattablePackage.TABLE__TABLE_CONFIGURATION:

-			return tableConfiguration != null;

-		case NattablePackage.TABLE__INVERT_AXIS:

-			return invertAxis != INVERT_AXIS_EDEFAULT;

-		case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-			return columnAxisProvidersHistory != null && !columnAxisProvidersHistory.isEmpty();

-		case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-			return rowAxisProvidersHistory != null && !rowAxisProvidersHistory.isEmpty();

-		case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-			return localRowHeaderAxisConfiguration != null;

-		case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-			return localColumnHeaderAxisConfiguration != null;

-		case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

-			return currentRowAxisProvider != null;

-		case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

-			return currentColumnAxisProvider != null;

-		case NattablePackage.TABLE__CELLS:

-			return cells != null && !cells.isEmpty();

+		switch (featureID) {

+			case NattablePackage.TABLE__CONTEXT:

+				return context != null;

+			case NattablePackage.TABLE__OWNER:

+				return owner != null;

+			case NattablePackage.TABLE__PROTOTYPE:

+				return prototype != null;

+			case NattablePackage.TABLE__TABLE_CONFIGURATION:

+				return tableConfiguration != null;

+			case NattablePackage.TABLE__INVERT_AXIS:

+				return invertAxis != INVERT_AXIS_EDEFAULT;

+			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

+				return columnAxisProvidersHistory != null && !columnAxisProvidersHistory.isEmpty();

+			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

+				return rowAxisProvidersHistory != null && !rowAxisProvidersHistory.isEmpty();

+			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

+				return localRowHeaderAxisConfiguration != null;

+			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

+				return localColumnHeaderAxisConfiguration != null;

+			case NattablePackage.TABLE__CURRENT_ROW_AXIS_PROVIDER:

+				return currentRowAxisProvider != null;

+			case NattablePackage.TABLE__CURRENT_COLUMN_AXIS_PROVIDER:

+				return currentColumnAxisProvider != null;

+			case NattablePackage.TABLE__CELLS:

+				return cells != null && !cells.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -894,14 +801,12 @@ public class TableImpl extends TableNamedElementImpl implements Table {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (invertAxis: "); //$NON-NLS-1$

 		result.append(invertAxis);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java
index 9bc2f3233e5..b6a4c536f73 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/AxisGroup.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis <em>Grouped Axis</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis <em>Grouped Axis</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getAxisGroup()

  * @model

@@ -40,7 +40,6 @@ public interface AxisGroup extends IAxis {
 	 * If the meaning of the '<em>Grouped Axis</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>Grouped Axis</em>' reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getAxisGroup_GroupedAxis()

 	 * @model

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
index f288b39eb62..bcc050bebf0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.ecore.EObject;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectAxis()

  * @model

@@ -39,7 +39,6 @@ public interface EObjectAxis extends ObjectAxis {
 	 * <!-- begin-model-doc -->

 	 * This IAxis allows to reference an EObject.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Element</em>' reference.

 	 * @see #setElement(EObject)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectAxis_Element()

@@ -50,13 +49,10 @@ public interface EObjectAxis extends ObjectAxis {
 	EObject getElement();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}'

-	 * reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement <em>Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Element</em>' reference.

+	 * @param value the new value of the '<em>Element</em>' reference.

 	 * @see #getElement()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationAxis.java
new file mode 100644
index 00000000000..c86e6ac7f7f
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationAxis.java
@@ -0,0 +1,64 @@
+/**

+ * 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.nattableaxis;

+

+import org.eclipse.emf.ecore.EOperation;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EOperation Axis</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <!-- begin-model-doc -->

+ * IAxis used to reference EMF EOperation.

+ * <!-- end-model-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis#getElement <em>Element</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEOperationAxis()

+ * @model

+ * @generated

+ */

+public interface EOperationAxis extends OperationAxis {

+	/**

+	 * Returns the value of the '<em><b>Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Element</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Element</em>' reference.

+	 * @see #setElement(EOperation)

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEOperationAxis_Element()

+	 * @model required="true"

+	 * @generated

+	 */

+	EOperation getElement();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis#getElement <em>Element</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Element</em>' reference.

+	 * @see #getElement()

+	 * @generated

+	 */

+	void setElement(EOperation value);

+

+} // EOperationAxis

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationTreeItemAxis.java
new file mode 100644
index 00000000000..29bc8f35e2b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EOperationTreeItemAxis.java
@@ -0,0 +1,27 @@
+/**

+ * 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.nattableaxis;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>EOperation Tree Item Axis</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEOperationTreeItemAxis()

+ * @model

+ * @generated

+ */

+public interface EOperationTreeItemAxis extends EOperationAxis, ITreeItemAxis {

+} // EOperationTreeItemAxis

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
index 34b9a92a23e..07d9264eab4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
@@ -25,10 +25,10 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureAxis()

  * @model

@@ -43,7 +43,6 @@ public interface EStructuralFeatureAxis extends FeatureAxis {
 	 * <!-- begin-model-doc -->

 	 * The represented EStructuralFeature.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Element</em>' reference.

 	 * @see #setElement(EStructuralFeature)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureAxis_Element()

@@ -54,13 +53,10 @@ public interface EStructuralFeatureAxis extends FeatureAxis {
 	EStructuralFeature getElement();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement

-	 * <em>Element</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Element</em>' reference.

+	 * @param value the new value of the '<em>Element</em>' reference.

 	 * @see #getElement()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
index 268bd2d0119..aab93520e61 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
@@ -25,11 +25,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.F
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration

- * </em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureAxis()

  * @model abstract="true"

@@ -45,7 +44,6 @@ public interface FeatureAxis extends IAxis {
 	 * Returns the local label configuration to use for this IAxis. This configuration

 	 * will override the label configuration defined in the AxisManagerConfiguration.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Local Label Configuration</em>' containment reference.

 	 * @see #setLocalLabelConfiguration(FeatureLabelProviderConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureAxis_LocalLabelConfiguration()

@@ -56,13 +54,10 @@ public interface FeatureAxis extends IAxis {
 	FeatureLabelProviderConfiguration getLocalLabelConfiguration();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration

-	 * <em>Local Label Configuration</em>}' containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Local Label Configuration</em>' containment reference.

+	 * @param value the new value of the '<em>Local Label Configuration</em>' containment reference.

 	 * @see #getLocalLabelConfiguration()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
index 5f5608bc627..25826859e94 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
@@ -19,7 +19,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
  *

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureTreeItemAxis()

- * @model

+ * @model abstract="true"

  * @generated

  */

 public interface FeatureTreeItemAxis extends FeatureAxis, ITreeItemAxis {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
index 425b60fab55..ae7af93ef9b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
@@ -27,11 +27,11 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager <em>Manager</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager <em>Manager</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis()

  * @model interface="true" abstract="true"

@@ -46,7 +46,6 @@ public interface IAxis extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * This field can't be null. Reference the axis manager providing this IAxis.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Manager</em>' reference.

 	 * @see #setManager(AxisManagerRepresentation)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis_Manager()

@@ -59,9 +58,7 @@ public interface IAxis extends StyledElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager <em>Manager</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Manager</em>' reference.

+	 * @param value the new value of the '<em>Manager</em>' reference.

 	 * @see #getManager()

 	 * @generated

 	 */

@@ -74,7 +71,6 @@ public interface IAxis extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * An element can be displayed using an alias instead of its real name.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Alias</em>' attribute.

 	 * @see #setAlias(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis_Alias()

@@ -87,9 +83,7 @@ public interface IAxis extends StyledElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Alias</em>' attribute.

+	 * @param value the new value of the '<em>Alias</em>' attribute.

 	 * @see #getAlias()

 	 * @generated

 	 */

@@ -101,7 +95,6 @@ public interface IAxis extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * Returns the elements represented by the IAxis

 	 * <!-- end-model-doc -->

-	 *

 	 * @model kind="operation"

 	 * @generated

 	 */

@@ -114,7 +107,6 @@ public interface IAxis extends StyledElement {
 	 * Returns the local label configuration to use for this IAxis. This configuration

 	 * will override the label configuration defined in the AxisManagerConfiguration.

 	 * <!-- end-model-doc -->

-	 *

 	 * @model kind="operation"

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java
index 20785094ec5..64ecbb59a26 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ITreeItemAxis.java
@@ -21,12 +21,12 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis()

  * @model interface="true" abstract="true"

@@ -36,14 +36,12 @@ public interface ITreeItemAxis extends IAxis {
 

 	/**

 	 * Returns the value of the '<em><b>Parent</b></em>' reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren

-	 * <em>Children</em>}'.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Parent</em>' reference isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Parent</em>' reference.

 	 * @see #setParent(ITreeItemAxis)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis_Parent()

@@ -54,13 +52,10 @@ public interface ITreeItemAxis extends IAxis {
 	ITreeItemAxis getParent();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}'

-	 * reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Parent</em>' reference.

+	 * @param value the new value of the '<em>Parent</em>' reference.

 	 * @see #getParent()

 	 * @generated

 	 */

@@ -74,7 +69,6 @@ public interface ITreeItemAxis extends IAxis {
 	 * If the meaning of the '<em>Expanded</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Expanded</em>' attribute.

 	 * @see #setExpanded(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis_Expanded()

@@ -84,13 +78,10 @@ public interface ITreeItemAxis extends IAxis {
 	boolean isExpanded();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Expanded</em>' attribute.

+	 * @param value the new value of the '<em>Expanded</em>' attribute.

 	 * @see #isExpanded()

 	 * @generated

 	 */

@@ -99,14 +90,12 @@ public interface ITreeItemAxis extends IAxis {
 	/**

 	 * Returns the value of the '<em><b>Children</b></em>' reference list.

 	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent

-	 * <em>Parent</em>}'.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <p>

 	 * If the meaning of the '<em>Children</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>Children</em>' reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getITreeItemAxis_Children()

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
index 6f6829d5eec..0beb1461acd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
@@ -19,10 +19,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdAxis()

  * @model abstract="true"

@@ -37,7 +37,6 @@ public interface IdAxis extends IAxis {
 	 * <!-- begin-model-doc -->

 	 * This obejct allows to reference an element using a string instead of referencing it directly.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Element</em>' attribute.

 	 * @see #setElement(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdAxis_Element()

@@ -51,9 +50,7 @@ public interface IdAxis extends IAxis {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Element</em>' attribute.

+	 * @param value the new value of the '<em>Element</em>' attribute.

 	 * @see #getElement()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
index f4e6f47acb0..08d4083449a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage

  * @generated

  */

@@ -29,7 +28,6 @@ public interface NattableaxisFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattableaxisFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisFactoryImpl.init();

@@ -38,7 +36,6 @@ public interface NattableaxisFactory extends EFactory {
 	 * Returns a new object of class '<em>Id Tree Item Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Id Tree Item Axis</em>'.

 	 * @generated

 	 */

@@ -48,7 +45,6 @@ public interface NattableaxisFactory extends EFactory {
 	 * Returns a new object of class '<em>EObject Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>EObject Axis</em>'.

 	 * @generated

 	 */

@@ -58,37 +54,15 @@ public interface NattableaxisFactory extends EFactory {
 	 * Returns a new object of class '<em>EObject Tree Item Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>EObject Tree Item Axis</em>'.

 	 * @generated

 	 */

 	EObjectTreeItemAxis createEObjectTreeItemAxis();

 

 	/**

-	 * Returns a new object of class '<em>Feature Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Feature Tree Item Axis</em>'.

-	 * @generated

-	 */

-	FeatureTreeItemAxis createFeatureTreeItemAxis();

-

-	/**

-	 * Returns a new object of class '<em>Object Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Object Tree Item Axis</em>'.

-	 * @generated

-	 */

-	ObjectTreeItemAxis createObjectTreeItemAxis();

-

-	/**

 	 * Returns a new object of class '<em>Feature Id Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Feature Id Axis</em>'.

 	 * @generated

 	 */

@@ -98,7 +72,6 @@ public interface NattableaxisFactory extends EFactory {
 	 * Returns a new object of class '<em>Feature Id Tree Item Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Feature Id Tree Item Axis</em>'.

 	 * @generated

 	 */

@@ -108,27 +81,42 @@ public interface NattableaxisFactory extends EFactory {
 	 * Returns a new object of class '<em>EStructural Feature Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>EStructural Feature Axis</em>'.

 	 * @generated

 	 */

 	EStructuralFeatureAxis createEStructuralFeatureAxis();

 

 	/**

+	 * Returns a new object of class '<em>EOperation Axis</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>EOperation Axis</em>'.

+	 * @generated

+	 */

+	EOperationAxis createEOperationAxis();

+

+	/**

 	 * Returns a new object of class '<em>EStructural Feature Tree Item Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>EStructural Feature Tree Item Axis</em>'.

 	 * @generated

 	 */

 	EStructuralFeatureTreeItemAxis createEStructuralFeatureTreeItemAxis();

 

 	/**

+	 * Returns a new object of class '<em>EOperation Tree Item Axis</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>EOperation Tree Item Axis</em>'.

+	 * @generated

+	 */

+	EOperationTreeItemAxis createEOperationTreeItemAxis();

+

+	/**

 	 * Returns a new object of class '<em>Object Id Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Object Id Axis</em>'.

 	 * @generated

 	 */

@@ -138,7 +126,6 @@ public interface NattableaxisFactory extends EFactory {
 	 * Returns a new object of class '<em>Object Id Tree Item Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Object Id Tree Item Axis</em>'.

 	 * @generated

 	 */

@@ -148,7 +135,6 @@ public interface NattableaxisFactory extends EFactory {
 	 * Returns a new object of class '<em>Axis Group</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Axis Group</em>'.

 	 * @generated

 	 */

@@ -158,7 +144,6 @@ public interface NattableaxisFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
index f848eeb9ed0..8a18c4c246d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
@@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory

  * @model kind="package"

  * @generated

@@ -42,7 +41,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNAME = "nattableaxis"; //$NON-NLS-1$

@@ -51,7 +49,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"; //$NON-NLS-1$

@@ -60,7 +57,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "nattableaxis"; //$NON-NLS-1$

@@ -69,7 +65,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattableaxisPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl.init();

@@ -78,7 +73,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIAxis()

 	 * @generated

@@ -89,7 +83,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -99,7 +92,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -109,7 +101,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -119,7 +110,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -129,7 +119,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>IAxis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -139,7 +128,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -149,7 +137,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -159,7 +146,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -169,7 +155,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -179,7 +164,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -189,7 +173,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -199,18 +182,15 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>IAxis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int IAXIS_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 2;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}'

-	 * class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getITreeItemAxis()

 	 * @generated

@@ -221,7 +201,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -231,7 +210,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -241,7 +219,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -251,7 +228,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -261,7 +237,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -271,7 +246,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -281,7 +255,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Children</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -291,7 +264,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>ITree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -301,7 +273,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -311,7 +282,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -321,7 +291,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -331,7 +300,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -341,7 +309,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -351,7 +318,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -361,7 +327,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>ITree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -371,7 +336,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl <em>Id Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdAxis()

 	 * @generated

@@ -382,7 +346,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -392,7 +355,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -402,7 +364,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -412,7 +373,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -422,7 +382,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -432,7 +391,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>Id Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -442,7 +400,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -452,7 +409,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -462,7 +418,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -472,7 +427,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -482,7 +436,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -492,7 +445,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -502,18 +454,15 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>Id Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int ID_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl

-	 * <em>Id Tree Item Axis</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl <em>Id Tree Item Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdTreeItemAxis()

 	 * @generated

@@ -524,7 +473,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -534,7 +482,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -544,7 +491,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -554,7 +500,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -564,7 +509,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -574,7 +518,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -584,7 +527,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -594,7 +536,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Children</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -604,7 +545,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>Id Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -614,7 +554,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -624,7 +563,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -634,7 +572,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -644,7 +581,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -654,7 +590,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -664,7 +599,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -674,29 +608,25 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>Id Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int ID_TREE_ITEM_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl <em>Object Axis</em>}'

-	 * class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl <em>Object Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectAxis()

 	 * @generated

 	 */

-	int OBJECT_AXIS = 8;

+	int OBJECT_AXIS = 10;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -706,7 +636,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -716,7 +645,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -726,7 +654,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -736,7 +663,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -746,7 +672,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>Object Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -756,7 +681,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -766,7 +690,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -776,7 +699,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -786,7 +708,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -796,7 +717,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -806,7 +726,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -816,18 +735,15 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>Object Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int OBJECT_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl <em>EObject Axis</em>}'

-	 * class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl <em>EObject Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectAxis()

 	 * @generated

@@ -838,7 +754,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -848,7 +763,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -858,7 +772,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -868,7 +781,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -878,7 +790,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -888,7 +799,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -898,7 +808,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>EObject Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -908,7 +817,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -918,7 +826,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -928,7 +835,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -938,7 +844,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -948,7 +853,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -958,7 +862,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -968,18 +871,15 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>EObject Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int EOBJECT_AXIS_OPERATION_COUNT = OBJECT_AXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl

-	 * <em>EObject Tree Item Axis</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl <em>EObject Tree Item Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectTreeItemAxis()

 	 * @generated

@@ -990,7 +890,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1000,7 +899,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1010,7 +908,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1020,7 +917,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1030,7 +926,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1040,7 +935,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1050,7 +944,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1060,7 +953,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1070,7 +962,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Children</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1080,7 +971,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>EObject Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1090,7 +980,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1100,7 +989,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1110,7 +998,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1120,7 +1007,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1130,7 +1016,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1140,7 +1025,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1150,18 +1034,15 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>EObject Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int EOBJECT_TREE_ITEM_AXIS_OPERATION_COUNT = EOBJECT_AXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl <em>Feature Axis</em>}'

-	 * class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl <em>Feature Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureAxis()

 	 * @generated

@@ -1172,7 +1053,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1182,7 +1062,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1192,7 +1071,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1202,7 +1080,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1212,7 +1089,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1222,7 +1098,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1232,7 +1107,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1242,7 +1116,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1252,7 +1125,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1262,7 +1134,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1272,7 +1143,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1282,7 +1152,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1292,29 +1161,152 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>Feature Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int FEATURE_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl

-	 * <em>Feature Tree Item Axis</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl <em>Operation Axis</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationAxis()

+	 * @generated

+	 */

+	int OPERATION_AXIS = 7;

+

+	/**

+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;

+

+	/**

+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS__STYLES = IAXIS__STYLES;

+

+	/**

+	 * The feature id for the '<em><b>Manager</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS__MANAGER = IAXIS__MANAGER;

+

+	/**

+	 * The feature id for the '<em><b>Alias</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS__ALIAS = IAXIS__ALIAS;

+

+	/**

+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Operation Axis</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

+

+	/**

+	 * The operation id for the '<em>Get EAnnotation</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

+

+	/**

+	 * The operation id for the '<em>Get Named Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING = IAXIS___GET_NAMED_STYLE__ECLASS_STRING;

+

+	/**

+	 * The operation id for the '<em>Get Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS___GET_STYLE__ECLASS = IAXIS___GET_STYLE__ECLASS;

+

+	/**

+	 * The operation id for the '<em>Create Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS___CREATE_STYLE__ECLASS = IAXIS___CREATE_STYLE__ECLASS;

+

+	/**

+	 * The operation id for the '<em>Get Element</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;

+

+	/**

+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION = IAXIS___GET_LOCAL_LABEL_CONFIGURATION;

+

+	/**

+	 * The number of operations of the '<em>Operation Axis</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl <em>Feature Tree Item Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureTreeItemAxis()

 	 * @generated

 	 */

-	int FEATURE_TREE_ITEM_AXIS = 7;

+	int FEATURE_TREE_ITEM_AXIS = 8;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1324,7 +1316,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1334,7 +1325,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1344,7 +1334,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1354,7 +1343,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1364,7 +1352,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1374,7 +1361,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1384,7 +1370,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Children</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1394,7 +1379,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1404,7 +1388,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1414,7 +1397,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1424,7 +1406,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1434,7 +1415,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1444,7 +1424,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1454,7 +1433,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1464,29 +1442,179 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>Feature Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int FEATURE_TREE_ITEM_AXIS_OPERATION_COUNT = FEATURE_AXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl

-	 * <em>Object Tree Item Axis</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl <em>Operation Tree Item Axis</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationTreeItemAxis()

+	 * @generated

+	 */

+	int OPERATION_TREE_ITEM_AXIS = 9;

+

+	/**

+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS__EANNOTATIONS = OPERATION_AXIS__EANNOTATIONS;

+

+	/**

+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS__STYLES = OPERATION_AXIS__STYLES;

+

+	/**

+	 * The feature id for the '<em><b>Manager</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS__MANAGER = OPERATION_AXIS__MANAGER;

+

+	/**

+	 * The feature id for the '<em><b>Alias</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS__ALIAS = OPERATION_AXIS__ALIAS;

+

+	/**

+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION;

+

+	/**

+	 * The feature id for the '<em><b>Parent</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS__PARENT = OPERATION_AXIS_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS__EXPANDED = OPERATION_AXIS_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Children</b></em>' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS__CHILDREN = OPERATION_AXIS_FEATURE_COUNT + 2;

+

+	/**

+	 * The number of structural features of the '<em>Operation Tree Item Axis</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS_FEATURE_COUNT = OPERATION_AXIS_FEATURE_COUNT + 3;

+

+	/**

+	 * The operation id for the '<em>Get EAnnotation</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = OPERATION_AXIS___GET_EANNOTATION__STRING;

+

+	/**

+	 * The operation id for the '<em>Get Named Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

+

+	/**

+	 * The operation id for the '<em>Get Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS___GET_STYLE__ECLASS = OPERATION_AXIS___GET_STYLE__ECLASS;

+

+	/**

+	 * The operation id for the '<em>Create Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = OPERATION_AXIS___CREATE_STYLE__ECLASS;

+

+	/**

+	 * The operation id for the '<em>Get Element</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS___GET_ELEMENT = OPERATION_AXIS___GET_ELEMENT;

+

+	/**

+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

+

+	/**

+	 * The number of operations of the '<em>Operation Tree Item Axis</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_TREE_ITEM_AXIS_OPERATION_COUNT = OPERATION_AXIS_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl <em>Object Tree Item Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectTreeItemAxis()

 	 * @generated

 	 */

-	int OBJECT_TREE_ITEM_AXIS = 9;

+	int OBJECT_TREE_ITEM_AXIS = 11;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1496,7 +1624,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1506,7 +1633,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1516,7 +1642,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1526,7 +1651,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1536,7 +1660,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1546,7 +1669,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1556,7 +1678,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Children</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1566,7 +1687,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>Object Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1576,7 +1696,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1586,7 +1705,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1596,7 +1714,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1606,7 +1723,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1616,7 +1732,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1626,7 +1741,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1636,29 +1750,25 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>Object Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int OBJECT_TREE_ITEM_AXIS_OPERATION_COUNT = OBJECT_AXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl

-	 * <em>Feature Id Axis</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl <em>Feature Id Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdAxis()

 	 * @generated

 	 */

-	int FEATURE_ID_AXIS = 10;

+	int FEATURE_ID_AXIS = 12;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1668,7 +1778,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1678,7 +1787,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1688,7 +1796,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1698,7 +1805,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1708,7 +1814,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1718,7 +1823,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature Id Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1728,7 +1832,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1738,7 +1841,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1748,7 +1850,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1758,7 +1859,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1768,7 +1868,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1778,7 +1877,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1788,29 +1886,25 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>Feature Id Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int FEATURE_ID_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl

-	 * <em>Feature Id Tree Item Axis</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl <em>Feature Id Tree Item Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdTreeItemAxis()

 	 * @generated

 	 */

-	int FEATURE_ID_TREE_ITEM_AXIS = 11;

+	int FEATURE_ID_TREE_ITEM_AXIS = 13;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1820,7 +1914,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1830,7 +1923,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1840,7 +1932,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1850,7 +1941,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1860,7 +1950,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1870,7 +1959,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1880,7 +1968,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1890,7 +1977,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Children</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1900,7 +1986,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature Id Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1910,7 +1995,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1920,7 +2004,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1930,7 +2013,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1940,7 +2022,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1950,7 +2031,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1960,7 +2040,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1970,29 +2049,25 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>Feature Id Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int FEATURE_ID_TREE_ITEM_AXIS_OPERATION_COUNT = FEATURE_ID_AXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl

-	 * <em>EStructural Feature Axis</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl <em>EStructural Feature Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureAxis()

 	 * @generated

 	 */

-	int ESTRUCTURAL_FEATURE_AXIS = 12;

+	int ESTRUCTURAL_FEATURE_AXIS = 14;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2002,7 +2077,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2012,7 +2086,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2022,7 +2095,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2032,7 +2104,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2042,7 +2113,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2052,7 +2122,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>EStructural Feature Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2062,7 +2131,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2072,7 +2140,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2082,7 +2149,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2092,7 +2158,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2102,7 +2167,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2112,7 +2176,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2122,29 +2185,161 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>EStructural Feature Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int ESTRUCTURAL_FEATURE_AXIS_OPERATION_COUNT = FEATURE_AXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl

-	 * <em>EStructural Feature Tree Item Axis</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl <em>EOperation Axis</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationAxis()

+	 * @generated

+	 */

+	int EOPERATION_AXIS = 15;

+

+	/**

+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS__EANNOTATIONS = OPERATION_AXIS__EANNOTATIONS;

+

+	/**

+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS__STYLES = OPERATION_AXIS__STYLES;

+

+	/**

+	 * The feature id for the '<em><b>Manager</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS__MANAGER = OPERATION_AXIS__MANAGER;

+

+	/**

+	 * The feature id for the '<em><b>Alias</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS__ALIAS = OPERATION_AXIS__ALIAS;

+

+	/**

+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS__LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION;

+

+	/**

+	 * The feature id for the '<em><b>Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS__ELEMENT = OPERATION_AXIS_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>EOperation Axis</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS_FEATURE_COUNT = OPERATION_AXIS_FEATURE_COUNT + 1;

+

+	/**

+	 * The operation id for the '<em>Get EAnnotation</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS___GET_EANNOTATION__STRING = OPERATION_AXIS___GET_EANNOTATION__STRING;

+

+	/**

+	 * The operation id for the '<em>Get Named Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING = OPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

+

+	/**

+	 * The operation id for the '<em>Get Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS___GET_STYLE__ECLASS = OPERATION_AXIS___GET_STYLE__ECLASS;

+

+	/**

+	 * The operation id for the '<em>Create Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS___CREATE_STYLE__ECLASS = OPERATION_AXIS___CREATE_STYLE__ECLASS;

+

+	/**

+	 * The operation id for the '<em>Get Element</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS___GET_ELEMENT = OPERATION_AXIS___GET_ELEMENT;

+

+	/**

+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION = OPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

+

+	/**

+	 * The number of operations of the '<em>EOperation Axis</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_AXIS_OPERATION_COUNT = OPERATION_AXIS_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl <em>EStructural Feature Tree Item Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureTreeItemAxis()

 	 * @generated

 	 */

-	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS = 13;

+	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS = 16;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2154,7 +2349,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2164,7 +2358,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2174,7 +2367,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2184,7 +2376,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2194,7 +2385,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2204,7 +2394,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2214,7 +2403,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2224,7 +2412,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Children</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2234,7 +2421,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>EStructural Feature Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2244,7 +2430,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2254,7 +2439,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2264,7 +2448,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2274,7 +2457,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2284,7 +2466,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2294,7 +2475,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2304,29 +2484,188 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>EStructural Feature Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS_OPERATION_COUNT = ESTRUCTURAL_FEATURE_AXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl

-	 * <em>Object Id Axis</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl <em>EOperation Tree Item Axis</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationTreeItemAxis()

+	 * @generated

+	 */

+	int EOPERATION_TREE_ITEM_AXIS = 17;

+

+	/**

+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS__EANNOTATIONS = EOPERATION_AXIS__EANNOTATIONS;

+

+	/**

+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS__STYLES = EOPERATION_AXIS__STYLES;

+

+	/**

+	 * The feature id for the '<em><b>Manager</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS__MANAGER = EOPERATION_AXIS__MANAGER;

+

+	/**

+	 * The feature id for the '<em><b>Alias</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS__ALIAS = EOPERATION_AXIS__ALIAS;

+

+	/**

+	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS__LOCAL_LABEL_CONFIGURATION = EOPERATION_AXIS__LOCAL_LABEL_CONFIGURATION;

+

+	/**

+	 * The feature id for the '<em><b>Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS__ELEMENT = EOPERATION_AXIS__ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Parent</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS__PARENT = EOPERATION_AXIS_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS__EXPANDED = EOPERATION_AXIS_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Children</b></em>' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS__CHILDREN = EOPERATION_AXIS_FEATURE_COUNT + 2;

+

+	/**

+	 * The number of structural features of the '<em>EOperation Tree Item Axis</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS_FEATURE_COUNT = EOPERATION_AXIS_FEATURE_COUNT + 3;

+

+	/**

+	 * The operation id for the '<em>Get EAnnotation</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS___GET_EANNOTATION__STRING = EOPERATION_AXIS___GET_EANNOTATION__STRING;

+

+	/**

+	 * The operation id for the '<em>Get Named Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS___GET_NAMED_STYLE__ECLASS_STRING = EOPERATION_AXIS___GET_NAMED_STYLE__ECLASS_STRING;

+

+	/**

+	 * The operation id for the '<em>Get Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS___GET_STYLE__ECLASS = EOPERATION_AXIS___GET_STYLE__ECLASS;

+

+	/**

+	 * The operation id for the '<em>Create Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS___CREATE_STYLE__ECLASS = EOPERATION_AXIS___CREATE_STYLE__ECLASS;

+

+	/**

+	 * The operation id for the '<em>Get Element</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS___GET_ELEMENT = EOPERATION_AXIS___GET_ELEMENT;

+

+	/**

+	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS___GET_LOCAL_LABEL_CONFIGURATION = EOPERATION_AXIS___GET_LOCAL_LABEL_CONFIGURATION;

+

+	/**

+	 * The number of operations of the '<em>EOperation Tree Item Axis</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EOPERATION_TREE_ITEM_AXIS_OPERATION_COUNT = EOPERATION_AXIS_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl <em>Object Id Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdAxis()

 	 * @generated

 	 */

-	int OBJECT_ID_AXIS = 14;

+	int OBJECT_ID_AXIS = 18;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2336,7 +2675,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2346,7 +2684,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2356,7 +2693,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2366,7 +2702,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2376,7 +2711,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2386,7 +2720,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>Object Id Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2396,7 +2729,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2406,7 +2738,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2416,7 +2747,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2426,7 +2756,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2436,7 +2765,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2446,7 +2774,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2456,29 +2783,25 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>Object Id Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int OBJECT_ID_AXIS_OPERATION_COUNT = ID_AXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl

-	 * <em>Object Id Tree Item Axis</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl <em>Object Id Tree Item Axis</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdTreeItemAxis()

 	 * @generated

 	 */

-	int OBJECT_ID_TREE_ITEM_AXIS = 15;

+	int OBJECT_ID_TREE_ITEM_AXIS = 19;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2488,7 +2811,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2498,7 +2820,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2508,7 +2829,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2518,7 +2838,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2528,7 +2847,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Label Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2538,7 +2856,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2548,7 +2865,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Expanded</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2558,7 +2874,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Children</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2568,7 +2883,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>Object Id Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2578,7 +2892,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2588,7 +2901,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2598,7 +2910,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2608,7 +2919,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2618,7 +2928,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2628,7 +2937,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2638,29 +2946,25 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>Object Id Tree Item Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int OBJECT_ID_TREE_ITEM_AXIS_OPERATION_COUNT = OBJECT_ID_AXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl <em>Axis Group</em>}'

-	 * class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl <em>Axis Group</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getAxisGroup()

 	 * @generated

 	 */

-	int AXIS_GROUP = 16;

+	int AXIS_GROUP = 20;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2670,7 +2974,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2680,7 +2983,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2690,7 +2992,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2700,7 +3001,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The feature id for the '<em><b>Grouped Axis</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2710,7 +3010,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of structural features of the '<em>Axis Group</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2720,7 +3019,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2730,7 +3028,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2740,7 +3037,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2750,7 +3046,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2760,7 +3055,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2770,7 +3064,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The operation id for the '<em>Get Local Label Configuration</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2780,7 +3073,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * The number of operations of the '<em>Axis Group</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -2790,7 +3082,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>IAxis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis

 	 * @generated

@@ -2798,11 +3089,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getIAxis();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager

-	 * <em>Manager</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager <em>Manager</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Manager</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getManager()

 	 * @see #getIAxis()

@@ -2811,11 +3100,9 @@ public interface NattableaxisPackage extends EPackage {
 	EReference getIAxis_Manager();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}

-	 * '.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Alias</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias()

 	 * @see #getIAxis()

@@ -2824,11 +3111,9 @@ public interface NattableaxisPackage extends EPackage {
 	EAttribute getIAxis_Alias();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getElement() <em>Get Element</em>}

-	 * ' operation.

+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getElement() <em>Get Element</em>}' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the '<em>Get Element</em>' operation.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getElement()

 	 * @generated

@@ -2836,11 +3121,9 @@ public interface NattableaxisPackage extends EPackage {
 	EOperation getIAxis__GetElement();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getLocalLabelConfiguration()

-	 * <em>Get Local Label Configuration</em>}' operation.

+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getLocalLabelConfiguration() <em>Get Local Label Configuration</em>}' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the '<em>Get Local Label Configuration</em>' operation.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getLocalLabelConfiguration()

 	 * @generated

@@ -2848,11 +3131,9 @@ public interface NattableaxisPackage extends EPackage {
 	EOperation getIAxis__GetLocalLabelConfiguration();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis

-	 * <em>ITree Item Axis</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>ITree Item Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis

 	 * @generated

@@ -2860,11 +3141,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getITreeItemAxis();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent

-	 * <em>Parent</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent <em>Parent</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Parent</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getParent()

 	 * @see #getITreeItemAxis()

@@ -2873,11 +3152,9 @@ public interface NattableaxisPackage extends EPackage {
 	EReference getITreeItemAxis_Parent();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded

-	 * <em>Expanded</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded <em>Expanded</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Expanded</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#isExpanded()

 	 * @see #getITreeItemAxis()

@@ -2886,11 +3163,9 @@ public interface NattableaxisPackage extends EPackage {
 	EAttribute getITreeItemAxis_Expanded();

 

 	/**

-	 * Returns the meta object for the reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren <em>Children</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference list '<em>Children</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis#getChildren()

 	 * @see #getITreeItemAxis()

@@ -2902,7 +3177,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis <em>Id Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Id Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis

 	 * @generated

@@ -2910,11 +3184,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getIdAxis();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement

-	 * <em>Element</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement <em>Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Element</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis#getElement()

 	 * @see #getIdAxis()

@@ -2923,11 +3195,9 @@ public interface NattableaxisPackage extends EPackage {
 	EAttribute getIdAxis_Element();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis

-	 * <em>Id Tree Item Axis</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis <em>Id Tree Item Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Id Tree Item Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis

 	 * @generated

@@ -2938,7 +3208,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.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.nattableaxis.EObjectAxis

 	 * @generated

@@ -2946,11 +3215,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getEObjectAxis();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis#getElement

-	 * <em>Element</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.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.nattableaxis.EObjectAxis#getElement()

 	 * @see #getEObjectAxis()

@@ -2959,11 +3226,9 @@ public interface NattableaxisPackage extends EPackage {
 	EReference getEObjectAxis_Element();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis

-	 * <em>EObject Tree Item Axis</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis <em>EObject Tree Item Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>EObject Tree Item Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis

 	 * @generated

@@ -2974,7 +3239,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis <em>Feature Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Feature Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis

 	 * @generated

@@ -2982,12 +3246,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getFeatureAxis();

 

 	/**

-	 * Returns the meta object for the containment reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration

-	 * <em>Local Label Configuration</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference '<em>Local Label Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration()

 	 * @see #getFeatureAxis()

@@ -2996,11 +3257,30 @@ public interface NattableaxisPackage extends EPackage {
 	EReference getFeatureAxis_LocalLabelConfiguration();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis

-	 * <em>Feature Tree Item Axis</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis <em>Operation Axis</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Operation Axis</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis

+	 * @generated

+	 */

+	EClass getOperationAxis();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Local Label Configuration</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration()

+	 * @see #getOperationAxis()

+	 * @generated

+	 */

+	EReference getOperationAxis_LocalLabelConfiguration();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis <em>Feature Tree Item Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Feature Tree Item Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis

 	 * @generated

@@ -3008,10 +3288,19 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getFeatureTreeItemAxis();

 

 	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis <em>Operation Tree Item Axis</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Operation Tree Item Axis</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis

+	 * @generated

+	 */

+	EClass getOperationTreeItemAxis();

+

+	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis <em>Object Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Object Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis

 	 * @generated

@@ -3019,12 +3308,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getObjectAxis();

 

 	/**

-	 * Returns the meta object for the containment reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}

-	 * '.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference '<em>Local Label Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration()

 	 * @see #getObjectAxis()

@@ -3033,11 +3319,9 @@ public interface NattableaxisPackage extends EPackage {
 	EReference getObjectAxis_LocalLabelConfiguration();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis

-	 * <em>Object Tree Item Axis</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis <em>Object Tree Item Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Object Tree Item Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis

 	 * @generated

@@ -3045,11 +3329,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getObjectTreeItemAxis();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis

-	 * <em>Feature Id Axis</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis <em>Feature Id Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Feature Id Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis

 	 * @generated

@@ -3057,11 +3339,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getFeatureIdAxis();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis

-	 * <em>Feature Id Tree Item Axis</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis <em>Feature Id Tree Item Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Feature Id Tree Item Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis

 	 * @generated

@@ -3069,11 +3349,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getFeatureIdTreeItemAxis();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis

-	 * <em>EStructural Feature Axis</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis <em>EStructural Feature Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>EStructural Feature Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis

 	 * @generated

@@ -3081,11 +3359,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getEStructuralFeatureAxis();

 

 	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#getElement <em>Element</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis#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.nattableaxis.EStructuralFeatureAxis#getElement()

 	 * @see #getEStructuralFeatureAxis()

@@ -3094,11 +3370,30 @@ public interface NattableaxisPackage extends EPackage {
 	EReference getEStructuralFeatureAxis_Element();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis

-	 * <em>EStructural Feature Tree Item Axis</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis <em>EOperation Axis</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EOperation Axis</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis

+	 * @generated

+	 */

+	EClass getEOperationAxis();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis#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.nattableaxis.EOperationAxis#getElement()

+	 * @see #getEOperationAxis()

+	 * @generated

+	 */

+	EReference getEOperationAxis_Element();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis <em>EStructural Feature Tree Item Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>EStructural Feature Tree Item Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis

 	 * @generated

@@ -3106,11 +3401,19 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getEStructuralFeatureTreeItemAxis();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis <em>Object Id Axis</em>}

-	 * '.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis <em>EOperation Tree Item Axis</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>EOperation Tree Item Axis</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis

+	 * @generated

+	 */

+	EClass getEOperationTreeItemAxis();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis <em>Object Id Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Object Id Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis

 	 * @generated

@@ -3118,11 +3421,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getObjectIdAxis();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis

-	 * <em>Object Id Tree Item Axis</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis <em>Object Id Tree Item Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Object Id Tree Item Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis

 	 * @generated

@@ -3133,7 +3434,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup <em>Axis Group</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Axis Group</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup

 	 * @generated

@@ -3141,11 +3441,9 @@ public interface NattableaxisPackage extends EPackage {
 	EClass getAxisGroup();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis

-	 * <em>Grouped Axis</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis <em>Grouped Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference list '<em>Grouped Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup#getGroupedAxis()

 	 * @see #getAxisGroup()

@@ -3157,7 +3455,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -3174,7 +3471,6 @@ public interface NattableaxisPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -3183,7 +3479,6 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis <em>IAxis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIAxis()

 		 * @generated

@@ -3194,7 +3489,6 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Manager</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference IAXIS__MANAGER = eINSTANCE.getIAxis_Manager();

@@ -3203,7 +3497,6 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Alias</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute IAXIS__ALIAS = eINSTANCE.getIAxis_Alias();

@@ -3212,7 +3505,6 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Get Element</b></em>' operation.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EOperation IAXIS___GET_ELEMENT = eINSTANCE.getIAxis__GetElement();

@@ -3221,17 +3513,14 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Get Local Label Configuration</b></em>' operation.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EOperation IAXIS___GET_LOCAL_LABEL_CONFIGURATION = eINSTANCE.getIAxis__GetLocalLabelConfiguration();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis

-		 * <em>ITree Item Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getITreeItemAxis()

 		 * @generated

@@ -3242,7 +3531,6 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Parent</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference ITREE_ITEM_AXIS__PARENT = eINSTANCE.getITreeItemAxis_Parent();

@@ -3251,7 +3539,6 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Expanded</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute ITREE_ITEM_AXIS__EXPANDED = eINSTANCE.getITreeItemAxis_Expanded();

@@ -3260,17 +3547,14 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Children</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference ITREE_ITEM_AXIS__CHILDREN = eINSTANCE.getITreeItemAxis_Children();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl <em>Id Axis</em>}'

-		 * class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl <em>Id Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdAxis()

 		 * @generated

@@ -3281,17 +3565,14 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Element</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute ID_AXIS__ELEMENT = eINSTANCE.getIdAxis_Element();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl

-		 * <em>Id Tree Item Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl <em>Id Tree Item Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getIdTreeItemAxis()

 		 * @generated

@@ -3299,11 +3580,9 @@ public interface NattableaxisPackage extends EPackage {
 		EClass ID_TREE_ITEM_AXIS = eINSTANCE.getIdTreeItemAxis();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl

-		 * <em>EObject Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl <em>EObject Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectAxis()

 		 * @generated

@@ -3314,17 +3593,14 @@ public interface NattableaxisPackage extends EPackage {
 		 * 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.nattableaxis.impl.EObjectTreeItemAxisImpl

-		 * <em>EObject Tree Item Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl <em>EObject Tree Item Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEObjectTreeItemAxis()

 		 * @generated

@@ -3332,11 +3608,9 @@ public interface NattableaxisPackage extends EPackage {
 		EClass EOBJECT_TREE_ITEM_AXIS = eINSTANCE.getEObjectTreeItemAxis();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl

-		 * <em>Feature Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl <em>Feature Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureAxis()

 		 * @generated

@@ -3347,17 +3621,32 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Local Label Configuration</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getFeatureAxis_LocalLabelConfiguration();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl

-		 * <em>Feature Tree Item Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl <em>Operation Axis</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationAxis()

+		 * @generated

+		 */

+		EClass OPERATION_AXIS = eINSTANCE.getOperationAxis();

+

+		/**

+		 * The meta object literal for the '<em><b>Local Label Configuration</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getOperationAxis_LocalLabelConfiguration();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl <em>Feature Tree Item Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureTreeItemAxis()

 		 * @generated

@@ -3365,11 +3654,19 @@ public interface NattableaxisPackage extends EPackage {
 		EClass FEATURE_TREE_ITEM_AXIS = eINSTANCE.getFeatureTreeItemAxis();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl

-		 * <em>Object Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl <em>Operation Tree Item Axis</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getOperationTreeItemAxis()

+		 * @generated

+		 */

+		EClass OPERATION_TREE_ITEM_AXIS = eINSTANCE.getOperationTreeItemAxis();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl <em>Object Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectAxis()

 		 * @generated

@@ -3380,17 +3677,14 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Local Label Configuration</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getObjectAxis_LocalLabelConfiguration();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl

-		 * <em>Object Tree Item Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl <em>Object Tree Item Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectTreeItemAxis()

 		 * @generated

@@ -3398,11 +3692,9 @@ public interface NattableaxisPackage extends EPackage {
 		EClass OBJECT_TREE_ITEM_AXIS = eINSTANCE.getObjectTreeItemAxis();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl

-		 * <em>Feature Id Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl <em>Feature Id Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdAxis()

 		 * @generated

@@ -3410,11 +3702,9 @@ public interface NattableaxisPackage extends EPackage {
 		EClass FEATURE_ID_AXIS = eINSTANCE.getFeatureIdAxis();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl

-		 * <em>Feature Id Tree Item Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl <em>Feature Id Tree Item Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getFeatureIdTreeItemAxis()

 		 * @generated

@@ -3422,11 +3712,9 @@ public interface NattableaxisPackage extends EPackage {
 		EClass FEATURE_ID_TREE_ITEM_AXIS = eINSTANCE.getFeatureIdTreeItemAxis();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl

-		 * <em>EStructural Feature Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl <em>EStructural Feature Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureAxis()

 		 * @generated

@@ -3437,18 +3725,32 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference ESTRUCTURAL_FEATURE_AXIS__ELEMENT = eINSTANCE.getEStructuralFeatureAxis_Element();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl

-		 * <em>EStructural Feature Tree Item Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl <em>EOperation Axis</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationAxis()

+		 * @generated

+		 */

+		EClass EOPERATION_AXIS = eINSTANCE.getEOperationAxis();

+

+		/**

+		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference EOPERATION_AXIS__ELEMENT = eINSTANCE.getEOperationAxis_Element();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl <em>EStructural Feature Tree Item Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEStructuralFeatureTreeItemAxis()

 		 * @generated

@@ -3456,11 +3758,19 @@ public interface NattableaxisPackage extends EPackage {
 		EClass ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS = eINSTANCE.getEStructuralFeatureTreeItemAxis();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl

-		 * <em>Object Id Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl <em>EOperation Tree Item Axis</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getEOperationTreeItemAxis()

+		 * @generated

+		 */

+		EClass EOPERATION_TREE_ITEM_AXIS = eINSTANCE.getEOperationTreeItemAxis();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl <em>Object Id Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdAxis()

 		 * @generated

@@ -3468,11 +3778,9 @@ public interface NattableaxisPackage extends EPackage {
 		EClass OBJECT_ID_AXIS = eINSTANCE.getObjectIdAxis();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl

-		 * <em>Object Id Tree Item Axis</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl <em>Object Id Tree Item Axis</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectIdTreeItemAxis()

 		 * @generated

@@ -3480,11 +3788,9 @@ public interface NattableaxisPackage extends EPackage {
 		EClass OBJECT_ID_TREE_ITEM_AXIS = eINSTANCE.getObjectIdTreeItemAxis();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl

-		 * <em>Axis Group</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl <em>Axis Group</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getAxisGroup()

 		 * @generated

@@ -3495,7 +3801,6 @@ public interface NattableaxisPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Grouped Axis</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference AXIS_GROUP__GROUPED_AXIS = eINSTANCE.getAxisGroup_GroupedAxis();

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
index 4da0ce22c9d..eee90c52545 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
@@ -25,11 +25,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.O
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}

- * </li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectAxis()

  * @model abstract="true"

@@ -45,7 +44,6 @@ public interface ObjectAxis extends IAxis {
 	 * Returns the local label configuration to use for this IAxis. This configuration

 	 * will override the label configuration defined in the AxisManagerConfiguration.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Local Label Configuration</em>' containment reference.

 	 * @see #setLocalLabelConfiguration(ObjectLabelProviderConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectAxis_LocalLabelConfiguration()

@@ -56,13 +54,10 @@ public interface ObjectAxis extends IAxis {
 	ObjectLabelProviderConfiguration getLocalLabelConfiguration();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration

-	 * <em>Local Label Configuration</em>}' containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Local Label Configuration</em>' containment reference.

+	 * @param value the new value of the '<em>Local Label Configuration</em>' containment reference.

 	 * @see #getLocalLabelConfiguration()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
index cd80215c34e..241b335639d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
@@ -19,7 +19,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
  *

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectTreeItemAxis()

- * @model

+ * @model abstract="true"

  * @generated

  */

 public interface ObjectTreeItemAxis extends ObjectAxis, ITreeItemAxis {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationAxis.java
new file mode 100644
index 00000000000..2493434f7e9
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationAxis.java
@@ -0,0 +1,60 @@
+/**

+ * 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.nattableaxis;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Operation Axis</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getOperationAxis()

+ * @model abstract="true"

+ * @generated

+ */

+public interface OperationAxis extends IAxis {

+	/**

+	 * Returns the value of the '<em><b>Local Label Configuration</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Local Label Configuration</em>' containment reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Local Label Configuration</em>' containment reference.

+	 * @see #setLocalLabelConfiguration(OperationLabelProviderConfiguration)

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getOperationAxis_LocalLabelConfiguration()

+	 * @model containment="true"

+	 * @generated

+	 */

+	OperationLabelProviderConfiguration getLocalLabelConfiguration();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Local Label Configuration</em>' containment reference.

+	 * @see #getLocalLabelConfiguration()

+	 * @generated

+	 */

+	void setLocalLabelConfiguration(OperationLabelProviderConfiguration value);

+

+} // OperationAxis

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationTreeItemAxis.java
new file mode 100644
index 00000000000..773810964e7
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationTreeItemAxis.java
@@ -0,0 +1,27 @@
+/**

+ * 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.nattableaxis;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Operation Tree Item Axis</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getOperationTreeItemAxis()

+ * @model abstract="true"

+ * @generated

+ */

+public interface OperationTreeItemAxis extends OperationAxis, ITreeItemAxis {

+} // OperationTreeItemAxis

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java
index 28775b1dbb9..8befb6e71bd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/AxisGroupImpl.java
@@ -34,12 +34,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getManager <em>Manager</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getAlias <em>Alias</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getGroupedAxis <em>Grouped Axis</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getManager <em>Manager</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getAlias <em>Alias</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.AxisGroupImpl#getGroupedAxis <em>Grouped Axis</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -49,7 +49,6 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getManager()

 	 * @generated

 	 * @ordered

@@ -60,7 +59,6 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAlias()

 	 * @generated

 	 * @ordered

@@ -71,7 +69,6 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAlias()

 	 * @generated

 	 * @ordered

@@ -82,7 +79,6 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	 * The cached value of the '{@link #getGroupedAxis() <em>Grouped Axis</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getGroupedAxis()

 	 * @generated

 	 * @ordered

@@ -92,7 +88,6 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected AxisGroupImpl() {

@@ -102,7 +97,6 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -113,18 +107,16 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public AxisManagerRepresentation getManager() {

-		if(manager != null && manager.eIsProxy()) {

+		if (manager != null && manager.eIsProxy()) {

 			InternalEObject oldManager = (InternalEObject)manager;

 			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);

-			if(manager != oldManager) {

-				if(eNotificationRequired()) {

+			if (manager != oldManager) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.AXIS_GROUP__MANAGER, oldManager, manager));

-				}

 			}

 		}

 		return manager;

@@ -133,7 +125,6 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public AxisManagerRepresentation basicGetManager() {

@@ -143,22 +134,19 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setManager(AxisManagerRepresentation newManager) {

 		AxisManagerRepresentation oldManager = manager;

 		manager = newManager;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.AXIS_GROUP__MANAGER, oldManager, manager));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -169,27 +157,24 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setAlias(String newAlias) {

 		String oldAlias = alias;

 		alias = newAlias;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.AXIS_GROUP__ALIAS, oldAlias, alias));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<IAxis> getGroupedAxis() {

-		if(groupedAxis == null) {

+		if (groupedAxis == null) {

 			groupedAxis = new EObjectResolvingEList<IAxis>(IAxis.class, this, NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS);

 		}

 		return groupedAxis;

@@ -198,7 +183,6 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -211,7 +195,6 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -224,21 +207,18 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.AXIS_GROUP__MANAGER:

-			if(resolve) {

-				return getManager();

-			}

-			return basicGetManager();

-		case NattableaxisPackage.AXIS_GROUP__ALIAS:

-			return getAlias();

-		case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

-			return getGroupedAxis();

+		switch (featureID) {

+			case NattableaxisPackage.AXIS_GROUP__MANAGER:

+				if (resolve) return getManager();

+				return basicGetManager();

+			case NattableaxisPackage.AXIS_GROUP__ALIAS:

+				return getAlias();

+			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

+				return getGroupedAxis();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -246,23 +226,22 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.AXIS_GROUP__MANAGER:

-			setManager((AxisManagerRepresentation)newValue);

-			return;

-		case NattableaxisPackage.AXIS_GROUP__ALIAS:

-			setAlias((String)newValue);

-			return;

-		case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

-			getGroupedAxis().clear();

-			getGroupedAxis().addAll((Collection<? extends IAxis>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.AXIS_GROUP__MANAGER:

+				setManager((AxisManagerRepresentation)newValue);

+				return;

+			case NattableaxisPackage.AXIS_GROUP__ALIAS:

+				setAlias((String)newValue);

+				return;

+			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

+				getGroupedAxis().clear();

+				getGroupedAxis().addAll((Collection<? extends IAxis>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -270,21 +249,20 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.AXIS_GROUP__MANAGER:

-			setManager((AxisManagerRepresentation)null);

-			return;

-		case NattableaxisPackage.AXIS_GROUP__ALIAS:

-			setAlias(ALIAS_EDEFAULT);

-			return;

-		case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

-			getGroupedAxis().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.AXIS_GROUP__MANAGER:

+				setManager((AxisManagerRepresentation)null);

+				return;

+			case NattableaxisPackage.AXIS_GROUP__ALIAS:

+				setAlias(ALIAS_EDEFAULT);

+				return;

+			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

+				getGroupedAxis().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -292,18 +270,17 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.AXIS_GROUP__MANAGER:

-			return manager != null;

-		case NattableaxisPackage.AXIS_GROUP__ALIAS:

-			return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

-		case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

-			return groupedAxis != null && !groupedAxis.isEmpty();

+		switch (featureID) {

+			case NattableaxisPackage.AXIS_GROUP__MANAGER:

+				return manager != null;

+			case NattableaxisPackage.AXIS_GROUP__ALIAS:

+				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

+			case NattableaxisPackage.AXIS_GROUP__GROUPED_AXIS:

+				return groupedAxis != null && !groupedAxis.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -311,16 +288,15 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch(operationID) {

-		case NattableaxisPackage.AXIS_GROUP___GET_ELEMENT:

-			return getElement();

-		case NattableaxisPackage.AXIS_GROUP___GET_LOCAL_LABEL_CONFIGURATION:

-			return getLocalLabelConfiguration();

+		switch (operationID) {

+			case NattableaxisPackage.AXIS_GROUP___GET_ELEMENT:

+				return getElement();

+			case NattableaxisPackage.AXIS_GROUP___GET_LOCAL_LABEL_CONFIGURATION:

+				return getLocalLabelConfiguration();

 		}

 		return super.eInvoke(operationID, arguments);

 	}

@@ -328,14 +304,12 @@ public class AxisGroupImpl extends StyledElementImpl implements AxisGroup {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (alias: "); //$NON-NLS-1$

 		result.append(alias);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
index fa40a7dcd3f..a7510e99210 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl#getElement <em>Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectAxisImpl#getElement <em>Element</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -39,7 +39,6 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
 	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getElement()

 	 * @generated

 	 * @ordered

@@ -49,7 +48,6 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected EObjectAxisImpl() {

@@ -59,7 +57,6 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -70,18 +67,16 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject getElement() {

-		if(element != null && element.eIsProxy()) {

+		if (element != null && element.eIsProxy()) {

 			InternalEObject oldElement = (InternalEObject)element;

 			element = eResolveProxy(oldElement);

-			if(element != oldElement) {

-				if(eNotificationRequired()) {

+			if (element != oldElement) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOBJECT_AXIS__ELEMENT, oldElement, element));

-				}

 			}

 		}

 		return element;

@@ -90,7 +85,6 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EObject basicGetElement() {

@@ -100,32 +94,27 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setElement(EObject newElement) {

 		EObject oldElement = element;

 		element = newElement;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_AXIS__ELEMENT, oldElement, element));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

-			if(resolve) {

-				return getElement();

-			}

-			return basicGetElement();

+		switch (featureID) {

+			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

+				if (resolve) return getElement();

+				return basicGetElement();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -133,15 +122,14 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

-			setElement((EObject)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

+				setElement((EObject)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -149,15 +137,14 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

-			setElement((EObject)null);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

+				setElement((EObject)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -165,14 +152,13 @@ public class EObjectAxisImpl extends ObjectAxisImpl implements EObjectAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

-			return element != null;

+		switch (featureID) {

+			case NattableaxisPackage.EOBJECT_AXIS__ELEMENT:

+				return element != null;

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java
index 813e105a11a..a6c0c82d061 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectTreeItemAxisImpl.java
@@ -32,12 +32,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#getChildren <em>Children</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#getParent <em>Parent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EObjectTreeItemAxisImpl#getChildren <em>Children</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -47,7 +47,6 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getParent()

 	 * @generated

 	 * @ordered

@@ -58,7 +57,6 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -69,7 +67,6 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -80,7 +77,6 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getChildren()

 	 * @generated

 	 * @ordered

@@ -90,7 +86,6 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected EObjectTreeItemAxisImpl() {

@@ -100,7 +95,6 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -111,18 +105,16 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public ITreeItemAxis getParent() {

-		if(parent != null && parent.eIsProxy()) {

+		if (parent != null && parent.eIsProxy()) {

 			InternalEObject oldParent = (InternalEObject)parent;

 			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if(parent != oldParent) {

-				if(eNotificationRequired()) {

+			if (parent != oldParent) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-				}

 			}

 		}

 		return parent;

@@ -131,7 +123,6 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ITreeItemAxis basicGetParent() {

@@ -141,19 +132,14 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

 		ITreeItemAxis oldParent = parent;

 		parent = newParent;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -161,32 +147,26 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setParent(ITreeItemAxis newParent) {

-		if(newParent != parent) {

+		if (newParent != parent) {

 			NotificationChain msgs = null;

-			if(parent != null) {

+			if (parent != null)

 				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			if(newParent != null) {

+			if (newParent != null)

 				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

 			msgs = basicSetParent(newParent, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -197,27 +177,24 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setExpanded(boolean newExpanded) {

 		boolean oldExpanded = expanded;

 		expanded = newExpanded;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<ITreeItemAxis> getChildren() {

-		if(children == null) {

+		if (children == null) {

 			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

 		}

 		return children;

@@ -226,20 +203,18 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-			if(parent != null) {

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

+				if (parent != null)

+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

 		}

 		return super.eInverseAdd(otherEnd, featureID, msgs);

 	}

@@ -247,16 +222,15 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-			return basicSetParent(null, msgs);

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

+				return basicSetParent(null, msgs);

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -264,21 +238,18 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-			if(resolve) {

-				return getParent();

-			}

-			return basicGetParent();

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

-			return isExpanded();

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-			return getChildren();

+		switch (featureID) {

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

+				if (resolve) return getParent();

+				return basicGetParent();

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

+				return isExpanded();

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

+				return getChildren();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -286,23 +257,22 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)newValue);

-			return;

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded((Boolean)newValue);

-			return;

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)newValue);

+				return;

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded((Boolean)newValue);

+				return;

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -310,21 +280,20 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)null);

-			return;

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded(EXPANDED_EDEFAULT);

-			return;

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)null);

+				return;

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded(EXPANDED_EDEFAULT);

+				return;

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -332,18 +301,17 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-			return parent != null;

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

-			return expanded != EXPANDED_EDEFAULT;

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-			return children != null && !children.isEmpty();

+		switch (featureID) {

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

+				return parent != null;

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

+				return expanded != EXPANDED_EDEFAULT;

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

+				return children != null && !children.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -351,21 +319,16 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(derivedFeatureID) {

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (derivedFeatureID) {

+				case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

@@ -374,21 +337,16 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(baseFeatureID) {

-			case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (baseFeatureID) {

+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

@@ -397,14 +355,12 @@ public class EObjectTreeItemAxisImpl extends EObjectAxisImpl implements EObjectT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (expanded: "); //$NON-NLS-1$

 		result.append(expanded);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationAxisImpl.java
new file mode 100644
index 00000000000..767f8d412cf
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationAxisImpl.java
@@ -0,0 +1,166 @@
+/**

+ * 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.nattableaxis.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EOperation;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>EOperation Axis</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationAxisImpl#getElement <em>Element</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class EOperationAxisImpl extends OperationAxisImpl implements EOperationAxis {

+	/**

+	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getElement()

+	 * @generated

+	 * @ordered

+	 */

+	protected EOperation element;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EOperationAxisImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return NattableaxisPackage.Literals.EOPERATION_AXIS;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EOperation getElement() {

+		if (element != null && element.eIsProxy()) {

+			InternalEObject oldElement = (InternalEObject)element;

+			element = (EOperation)eResolveProxy(oldElement);

+			if (element != oldElement) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOPERATION_AXIS__ELEMENT, oldElement, element));

+			}

+		}

+		return element;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EOperation basicGetElement() {

+		return element;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setElement(EOperation newElement) {

+		EOperation oldElement = element;

+		element = newElement;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_AXIS__ELEMENT, oldElement, element));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:

+				if (resolve) return getElement();

+				return basicGetElement();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:

+				setElement((EOperation)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:

+				setElement((EOperation)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case NattableaxisPackage.EOPERATION_AXIS__ELEMENT:

+				return element != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //EOperationAxisImpl

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationTreeItemAxisImpl.java
new file mode 100644
index 00000000000..5f6079a6d6e
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EOperationTreeItemAxisImpl.java
@@ -0,0 +1,370 @@
+/**

+ * 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.nattableaxis.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>EOperation Tree Item Axis</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl#getParent <em>Parent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EOperationTreeItemAxisImpl#getChildren <em>Children</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class EOperationTreeItemAxisImpl extends EOperationAxisImpl implements EOperationTreeItemAxis {

+	/**

+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getParent()

+	 * @generated

+	 * @ordered

+	 */

+	protected ITreeItemAxis parent;

+

+	/**

+	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isExpanded()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean EXPANDED_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isExpanded()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean expanded = EXPANDED_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getChildren()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<ITreeItemAxis> children;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EOperationTreeItemAxisImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return NattableaxisPackage.Literals.EOPERATION_TREE_ITEM_AXIS;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ITreeItemAxis getParent() {

+		if (parent != null && parent.eIsProxy()) {

+			InternalEObject oldParent = (InternalEObject)parent;

+			parent = (ITreeItemAxis)eResolveProxy(oldParent);

+			if (parent != oldParent) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT, oldParent, parent));

+			}

+		}

+		return parent;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ITreeItemAxis basicGetParent() {

+		return parent;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

+		ITreeItemAxis oldParent = parent;

+		parent = newParent;

+		if (eNotificationRequired()) {

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setParent(ITreeItemAxis newParent) {

+		if (newParent != parent) {

+			NotificationChain msgs = null;

+			if (parent != null)

+				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+			if (newParent != null)

+				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+			msgs = basicSetParent(newParent, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT, newParent, newParent));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isExpanded() {

+		return expanded;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setExpanded(boolean newExpanded) {

+		boolean oldExpanded = expanded;

+		expanded = newExpanded;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<ITreeItemAxis> getChildren() {

+		if (children == null) {

+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

+		}

+		return children;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

+				if (parent != null)

+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

+				return basicSetParent(null, msgs);

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

+				if (resolve) return getParent();

+				return basicGetParent();

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:

+				return isExpanded();

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

+				return getChildren();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)newValue);

+				return;

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded((Boolean)newValue);

+				return;

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)null);

+				return;

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded(EXPANDED_EDEFAULT);

+				return;

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT:

+				return parent != null;

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED:

+				return expanded != EXPANDED_EDEFAULT;

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN:

+				return children != null && !children.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

+		if (baseClass == ITreeItemAxis.class) {

+			switch (derivedFeatureID) {

+				case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

+			}

+		}

+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

+		if (baseClass == ITreeItemAxis.class) {

+			switch (baseFeatureID) {

+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

+			}

+		}

+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (expanded: "); //$NON-NLS-1$

+		result.append(expanded);

+		result.append(')');

+		return result.toString();

+	}

+

+} //EOperationTreeItemAxisImpl

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
index 67cb06e009f..4258ca8f397 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl#getElement <em>Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureAxisImpl#getElement <em>Element</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -39,7 +39,6 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
 	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getElement()

 	 * @generated

 	 * @ordered

@@ -49,7 +48,6 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected EStructuralFeatureAxisImpl() {

@@ -59,7 +57,6 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -70,18 +67,16 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EStructuralFeature getElement() {

-		if(element != null && element.eIsProxy()) {

+		if (element != null && element.eIsProxy()) {

 			InternalEObject oldElement = (InternalEObject)element;

 			element = (EStructuralFeature)eResolveProxy(oldElement);

-			if(element != oldElement) {

-				if(eNotificationRequired()) {

+			if (element != oldElement) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT, oldElement, element));

-				}

 			}

 		}

 		return element;

@@ -90,7 +85,6 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EStructuralFeature basicGetElement() {

@@ -100,32 +94,27 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setElement(EStructuralFeature newElement) {

 		EStructuralFeature oldElement = element;

 		element = newElement;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT, oldElement, element));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

-			if(resolve) {

-				return getElement();

-			}

-			return basicGetElement();

+		switch (featureID) {

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

+				if (resolve) return getElement();

+				return basicGetElement();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -133,15 +122,14 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

-			setElement((EStructuralFeature)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

+				setElement((EStructuralFeature)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -149,15 +137,14 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

-			setElement((EStructuralFeature)null);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

+				setElement((EStructuralFeature)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -165,14 +152,13 @@ public class EStructuralFeatureAxisImpl extends FeatureAxisImpl implements EStru
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

-			return element != null;

+		switch (featureID) {

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS__ELEMENT:

+				return element != null;

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java
index 2a77cdb2ee3..2a50029a308 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureTreeItemAxisImpl.java
@@ -32,12 +32,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#getChildren <em>Children</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#getParent <em>Parent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.EStructuralFeatureTreeItemAxisImpl#getChildren <em>Children</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -47,7 +47,6 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getParent()

 	 * @generated

 	 * @ordered

@@ -58,7 +57,6 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -69,7 +67,6 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -80,7 +77,6 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getChildren()

 	 * @generated

 	 * @ordered

@@ -90,7 +86,6 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected EStructuralFeatureTreeItemAxisImpl() {

@@ -100,7 +95,6 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -111,18 +105,16 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public ITreeItemAxis getParent() {

-		if(parent != null && parent.eIsProxy()) {

+		if (parent != null && parent.eIsProxy()) {

 			InternalEObject oldParent = (InternalEObject)parent;

 			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if(parent != oldParent) {

-				if(eNotificationRequired()) {

+			if (parent != oldParent) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-				}

 			}

 		}

 		return parent;

@@ -131,7 +123,6 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ITreeItemAxis basicGetParent() {

@@ -141,19 +132,14 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

 		ITreeItemAxis oldParent = parent;

 		parent = newParent;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -161,32 +147,26 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setParent(ITreeItemAxis newParent) {

-		if(newParent != parent) {

+		if (newParent != parent) {

 			NotificationChain msgs = null;

-			if(parent != null) {

+			if (parent != null)

 				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			if(newParent != null) {

+			if (newParent != null)

 				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

 			msgs = basicSetParent(newParent, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -197,27 +177,24 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setExpanded(boolean newExpanded) {

 		boolean oldExpanded = expanded;

 		expanded = newExpanded;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<ITreeItemAxis> getChildren() {

-		if(children == null) {

+		if (children == null) {

 			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

 		}

 		return children;

@@ -226,20 +203,18 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-			if(parent != null) {

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

+				if (parent != null)

+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

 		}

 		return super.eInverseAdd(otherEnd, featureID, msgs);

 	}

@@ -247,16 +222,15 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-			return basicSetParent(null, msgs);

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

+				return basicSetParent(null, msgs);

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -264,21 +238,18 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-			if(resolve) {

-				return getParent();

-			}

-			return basicGetParent();

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

-			return isExpanded();

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			return getChildren();

+		switch (featureID) {

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

+				if (resolve) return getParent();

+				return basicGetParent();

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

+				return isExpanded();

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				return getChildren();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -286,23 +257,22 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)newValue);

-			return;

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded((Boolean)newValue);

-			return;

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)newValue);

+				return;

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded((Boolean)newValue);

+				return;

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -310,21 +280,20 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)null);

-			return;

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded(EXPANDED_EDEFAULT);

-			return;

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)null);

+				return;

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded(EXPANDED_EDEFAULT);

+				return;

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -332,18 +301,17 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-			return parent != null;

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

-			return expanded != EXPANDED_EDEFAULT;

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			return children != null && !children.isEmpty();

+		switch (featureID) {

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

+				return parent != null;

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

+				return expanded != EXPANDED_EDEFAULT;

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				return children != null && !children.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -351,21 +319,16 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(derivedFeatureID) {

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (derivedFeatureID) {

+				case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

@@ -374,21 +337,16 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(baseFeatureID) {

-			case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (baseFeatureID) {

+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

@@ -397,14 +355,12 @@ public class EStructuralFeatureTreeItemAxisImpl extends EStructuralFeatureAxisIm
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (expanded: "); //$NON-NLS-1$

 		result.append(expanded);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
index a32e9a61e75..58b3e16de87 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
@@ -32,13 +32,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getManager <em>Manager</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getAlias <em>Alias</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getLocalLabelConfiguration <em>Local Label

- * Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getManager <em>Manager</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getAlias <em>Alias</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -48,7 +47,6 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getManager()

 	 * @generated

 	 * @ordered

@@ -59,7 +57,6 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAlias()

 	 * @generated

 	 * @ordered

@@ -70,7 +67,6 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAlias()

 	 * @generated

 	 * @ordered

@@ -81,7 +77,6 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLocalLabelConfiguration()

 	 * @generated

 	 * @ordered

@@ -91,7 +86,6 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected FeatureAxisImpl() {

@@ -101,7 +95,6 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -112,18 +105,16 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public AxisManagerRepresentation getManager() {

-		if(manager != null && manager.eIsProxy()) {

+		if (manager != null && manager.eIsProxy()) {

 			InternalEObject oldManager = (InternalEObject)manager;

 			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);

-			if(manager != oldManager) {

-				if(eNotificationRequired()) {

+			if (manager != oldManager) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_AXIS__MANAGER, oldManager, manager));

-				}

 			}

 		}

 		return manager;

@@ -132,7 +123,6 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public AxisManagerRepresentation basicGetManager() {

@@ -142,22 +132,19 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setManager(AxisManagerRepresentation newManager) {

 		AxisManagerRepresentation oldManager = manager;

 		manager = newManager;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__MANAGER, oldManager, manager));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -168,22 +155,19 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setAlias(String newAlias) {

 		String oldAlias = alias;

 		alias = newAlias;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__ALIAS, oldAlias, alias));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -194,19 +178,14 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

 		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

 		localLabelConfiguration = newLocalLabelConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -214,32 +193,26 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {

-		if(newLocalLabelConfiguration != localLabelConfiguration) {

+		if (newLocalLabelConfiguration != localLabelConfiguration) {

 			NotificationChain msgs = null;

-			if(localLabelConfiguration != null) {

+			if (localLabelConfiguration != null)

 				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			}

-			if(newLocalLabelConfiguration != null) {

+			if (newLocalLabelConfiguration != null)

 				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			}

 			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -252,14 +225,13 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return basicSetLocalLabelConfiguration(null, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return basicSetLocalLabelConfiguration(null, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -267,21 +239,18 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-			if(resolve) {

-				return getManager();

-			}

-			return basicGetManager();

-		case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-			return getAlias();

-		case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return getLocalLabelConfiguration();

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

+				if (resolve) return getManager();

+				return basicGetManager();

+			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

+				return getAlias();

+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return getLocalLabelConfiguration();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -289,21 +258,20 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-			setManager((AxisManagerRepresentation)newValue);

-			return;

-		case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-			setAlias((String)newValue);

-			return;

-		case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-			setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

+				setManager((AxisManagerRepresentation)newValue);

+				return;

+			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

+				setAlias((String)newValue);

+				return;

+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

+				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -311,21 +279,20 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-			setManager((AxisManagerRepresentation)null);

-			return;

-		case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-			setAlias(ALIAS_EDEFAULT);

-			return;

-		case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-			setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

+				setManager((AxisManagerRepresentation)null);

+				return;

+			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

+				setAlias(ALIAS_EDEFAULT);

+				return;

+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

+				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -333,18 +300,17 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-			return manager != null;

-		case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-			return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

-		case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return localLabelConfiguration != null;

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

+				return manager != null;

+			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

+				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

+			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return localLabelConfiguration != null;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -352,14 +318,13 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch(operationID) {

-		case NattableaxisPackage.FEATURE_AXIS___GET_ELEMENT:

-			return getElement();

+		switch (operationID) {

+			case NattableaxisPackage.FEATURE_AXIS___GET_ELEMENT:

+				return getElement();

 		}

 		return super.eInvoke(operationID, arguments);

 	}

@@ -367,14 +332,12 @@ public abstract class FeatureAxisImpl extends StyledElementImpl implements Featu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (alias: "); //$NON-NLS-1$

 		result.append(alias);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
index 73fe2926fe0..1b847672593 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
@@ -28,11 +28,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.F
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl#getLocalLabelConfiguration <em>Local Label

- * Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -42,7 +41,6 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLocalLabelConfiguration()

 	 * @generated

 	 * @ordered

@@ -52,7 +50,6 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected FeatureIdAxisImpl() {

@@ -62,7 +59,6 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -73,7 +69,6 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -84,19 +79,14 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

 		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

 		localLabelConfiguration = newLocalLabelConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -104,39 +94,33 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {

-		if(newLocalLabelConfiguration != localLabelConfiguration) {

+		if (newLocalLabelConfiguration != localLabelConfiguration) {

 			NotificationChain msgs = null;

-			if(localLabelConfiguration != null) {

+			if (localLabelConfiguration != null)

 				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			}

-			if(newLocalLabelConfiguration != null) {

+			if (newLocalLabelConfiguration != null)

 				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			}

 			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return basicSetLocalLabelConfiguration(null, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return basicSetLocalLabelConfiguration(null, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -144,14 +128,13 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return getLocalLabelConfiguration();

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return getLocalLabelConfiguration();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -159,15 +142,14 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-			setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

+				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -175,15 +157,14 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-			setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

+				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -191,14 +172,13 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return localLabelConfiguration != null;

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return localLabelConfiguration != null;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -206,17 +186,14 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if(baseClass == FeatureAxis.class) {

-			switch(derivedFeatureID) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;

-			default:

-				return -1;

+		if (baseClass == FeatureAxis.class) {

+			switch (derivedFeatureID) {

+				case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;

+				default: return -1;

 			}

 		}

 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

@@ -225,17 +202,14 @@ public class FeatureIdAxisImpl extends IdAxisImpl implements FeatureIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if(baseClass == FeatureAxis.class) {

-			switch(baseFeatureID) {

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

-			default:

-				return -1;

+		if (baseClass == FeatureAxis.class) {

+			switch (baseFeatureID) {

+				case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

+				default: return -1;

 			}

 		}

 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java
index 0904aa77e8b..b0584714cd7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdTreeItemAxisImpl.java
@@ -32,12 +32,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#getChildren <em>Children</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#getParent <em>Parent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureIdTreeItemAxisImpl#getChildren <em>Children</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -47,7 +47,6 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getParent()

 	 * @generated

 	 * @ordered

@@ -58,7 +57,6 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -69,7 +67,6 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -80,7 +77,6 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getChildren()

 	 * @generated

 	 * @ordered

@@ -90,7 +86,6 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected FeatureIdTreeItemAxisImpl() {

@@ -100,7 +95,6 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -111,18 +105,16 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public ITreeItemAxis getParent() {

-		if(parent != null && parent.eIsProxy()) {

+		if (parent != null && parent.eIsProxy()) {

 			InternalEObject oldParent = (InternalEObject)parent;

 			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if(parent != oldParent) {

-				if(eNotificationRequired()) {

+			if (parent != oldParent) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-				}

 			}

 		}

 		return parent;

@@ -131,7 +123,6 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ITreeItemAxis basicGetParent() {

@@ -141,19 +132,14 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

 		ITreeItemAxis oldParent = parent;

 		parent = newParent;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -161,32 +147,26 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setParent(ITreeItemAxis newParent) {

-		if(newParent != parent) {

+		if (newParent != parent) {

 			NotificationChain msgs = null;

-			if(parent != null) {

+			if (parent != null)

 				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			if(newParent != null) {

+			if (newParent != null)

 				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

 			msgs = basicSetParent(newParent, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -197,27 +177,24 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setExpanded(boolean newExpanded) {

 		boolean oldExpanded = expanded;

 		expanded = newExpanded;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<ITreeItemAxis> getChildren() {

-		if(children == null) {

+		if (children == null) {

 			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

 		}

 		return children;

@@ -226,20 +203,18 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-			if(parent != null) {

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

+				if (parent != null)

+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

 		}

 		return super.eInverseAdd(otherEnd, featureID, msgs);

 	}

@@ -247,16 +222,15 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-			return basicSetParent(null, msgs);

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

+				return basicSetParent(null, msgs);

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -264,21 +238,18 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-			if(resolve) {

-				return getParent();

-			}

-			return basicGetParent();

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

-			return isExpanded();

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-			return getChildren();

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

+				if (resolve) return getParent();

+				return basicGetParent();

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

+				return isExpanded();

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

+				return getChildren();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -286,23 +257,22 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)newValue);

-			return;

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded((Boolean)newValue);

-			return;

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)newValue);

+				return;

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded((Boolean)newValue);

+				return;

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -310,21 +280,20 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)null);

-			return;

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded(EXPANDED_EDEFAULT);

-			return;

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)null);

+				return;

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded(EXPANDED_EDEFAULT);

+				return;

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -332,18 +301,17 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-			return parent != null;

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

-			return expanded != EXPANDED_EDEFAULT;

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-			return children != null && !children.isEmpty();

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

+				return parent != null;

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

+				return expanded != EXPANDED_EDEFAULT;

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

+				return children != null && !children.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -351,21 +319,16 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(derivedFeatureID) {

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (derivedFeatureID) {

+				case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

@@ -374,21 +337,16 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(baseFeatureID) {

-			case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (baseFeatureID) {

+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

@@ -397,14 +355,12 @@ public class FeatureIdTreeItemAxisImpl extends FeatureIdAxisImpl implements Feat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (expanded: "); //$NON-NLS-1$

 		result.append(expanded);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
index 3488fa65ddf..207b6956833 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
@@ -32,22 +32,21 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#getChildren <em>Children</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#getParent <em>Parent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.FeatureTreeItemAxisImpl#getChildren <em>Children</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

-public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureTreeItemAxis {

+public abstract class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureTreeItemAxis {

 

 	/**

 	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getParent()

 	 * @generated

 	 * @ordered

@@ -58,7 +57,6 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -69,7 +67,6 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -80,7 +77,6 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getChildren()

 	 * @generated

 	 * @ordered

@@ -90,7 +86,6 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected FeatureTreeItemAxisImpl() {

@@ -100,7 +95,6 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -111,18 +105,16 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public ITreeItemAxis getParent() {

-		if(parent != null && parent.eIsProxy()) {

+		if (parent != null && parent.eIsProxy()) {

 			InternalEObject oldParent = (InternalEObject)parent;

 			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if(parent != oldParent) {

-				if(eNotificationRequired()) {

+			if (parent != oldParent) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-				}

 			}

 		}

 		return parent;

@@ -131,7 +123,6 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ITreeItemAxis basicGetParent() {

@@ -141,19 +132,14 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

 		ITreeItemAxis oldParent = parent;

 		parent = newParent;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -161,32 +147,26 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setParent(ITreeItemAxis newParent) {

-		if(newParent != parent) {

+		if (newParent != parent) {

 			NotificationChain msgs = null;

-			if(parent != null) {

+			if (parent != null)

 				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			if(newParent != null) {

+			if (newParent != null)

 				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

 			msgs = basicSetParent(newParent, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT, newParent, newParent));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -197,27 +177,24 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setExpanded(boolean newExpanded) {

 		boolean oldExpanded = expanded;

 		expanded = newExpanded;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<ITreeItemAxis> getChildren() {

-		if(children == null) {

+		if (children == null) {

 			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

 		}

 		return children;

@@ -226,20 +203,18 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-			if(parent != null) {

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

+				if (parent != null)

+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

 		}

 		return super.eInverseAdd(otherEnd, featureID, msgs);

 	}

@@ -247,16 +222,15 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-			return basicSetParent(null, msgs);

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

+				return basicSetParent(null, msgs);

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -264,21 +238,18 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-			if(resolve) {

-				return getParent();

-			}

-			return basicGetParent();

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

-			return isExpanded();

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			return getChildren();

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

+				if (resolve) return getParent();

+				return basicGetParent();

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

+				return isExpanded();

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				return getChildren();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -286,23 +257,22 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)newValue);

-			return;

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded((Boolean)newValue);

-			return;

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)newValue);

+				return;

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded((Boolean)newValue);

+				return;

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -310,21 +280,20 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)null);

-			return;

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded(EXPANDED_EDEFAULT);

-			return;

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)null);

+				return;

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded(EXPANDED_EDEFAULT);

+				return;

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -332,18 +301,17 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-			return parent != null;

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

-			return expanded != EXPANDED_EDEFAULT;

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-			return children != null && !children.isEmpty();

+		switch (featureID) {

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

+				return parent != null;

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

+				return expanded != EXPANDED_EDEFAULT;

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

+				return children != null && !children.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -351,21 +319,16 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(derivedFeatureID) {

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (derivedFeatureID) {

+				case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

@@ -374,21 +337,16 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(baseFeatureID) {

-			case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (baseFeatureID) {

+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.FEATURE_TREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

@@ -397,14 +355,12 @@ public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureT
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (expanded: "); //$NON-NLS-1$

 		result.append(expanded);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
index 7048f534146..6a23e61b96e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
@@ -31,12 +31,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getManager <em>Manager</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getAlias <em>Alias</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getElement <em>Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getManager <em>Manager</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getAlias <em>Alias</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdAxisImpl#getElement <em>Element</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -46,7 +46,6 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getManager()

 	 * @generated

 	 * @ordered

@@ -57,7 +56,6 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAlias()

 	 * @generated

 	 * @ordered

@@ -68,7 +66,6 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAlias()

 	 * @generated

 	 * @ordered

@@ -79,7 +76,6 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	 * The default value of the '{@link #getElement() <em>Element</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getElement()

 	 * @generated

 	 * @ordered

@@ -90,7 +86,6 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	 * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getElement()

 	 * @generated

 	 * @ordered

@@ -100,7 +95,6 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected IdAxisImpl() {

@@ -110,7 +104,6 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -121,18 +114,16 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public AxisManagerRepresentation getManager() {

-		if(manager != null && manager.eIsProxy()) {

+		if (manager != null && manager.eIsProxy()) {

 			InternalEObject oldManager = (InternalEObject)manager;

 			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);

-			if(manager != oldManager) {

-				if(eNotificationRequired()) {

+			if (manager != oldManager) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ID_AXIS__MANAGER, oldManager, manager));

-				}

 			}

 		}

 		return manager;

@@ -141,7 +132,6 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public AxisManagerRepresentation basicGetManager() {

@@ -151,22 +141,19 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setManager(AxisManagerRepresentation newManager) {

 		AxisManagerRepresentation oldManager = manager;

 		manager = newManager;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__MANAGER, oldManager, manager));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -177,22 +164,19 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setAlias(String newAlias) {

 		String oldAlias = alias;

 		alias = newAlias;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ALIAS, oldAlias, alias));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -203,22 +187,19 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setElement(String newElement) {

 		String oldElement = element;

 		element = newElement;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_AXIS__ELEMENT, oldElement, element));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -231,21 +212,18 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.ID_AXIS__MANAGER:

-			if(resolve) {

-				return getManager();

-			}

-			return basicGetManager();

-		case NattableaxisPackage.ID_AXIS__ALIAS:

-			return getAlias();

-		case NattableaxisPackage.ID_AXIS__ELEMENT:

-			return getElement();

+		switch (featureID) {

+			case NattableaxisPackage.ID_AXIS__MANAGER:

+				if (resolve) return getManager();

+				return basicGetManager();

+			case NattableaxisPackage.ID_AXIS__ALIAS:

+				return getAlias();

+			case NattableaxisPackage.ID_AXIS__ELEMENT:

+				return getElement();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -253,21 +231,20 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.ID_AXIS__MANAGER:

-			setManager((AxisManagerRepresentation)newValue);

-			return;

-		case NattableaxisPackage.ID_AXIS__ALIAS:

-			setAlias((String)newValue);

-			return;

-		case NattableaxisPackage.ID_AXIS__ELEMENT:

-			setElement((String)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.ID_AXIS__MANAGER:

+				setManager((AxisManagerRepresentation)newValue);

+				return;

+			case NattableaxisPackage.ID_AXIS__ALIAS:

+				setAlias((String)newValue);

+				return;

+			case NattableaxisPackage.ID_AXIS__ELEMENT:

+				setElement((String)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -275,21 +252,20 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.ID_AXIS__MANAGER:

-			setManager((AxisManagerRepresentation)null);

-			return;

-		case NattableaxisPackage.ID_AXIS__ALIAS:

-			setAlias(ALIAS_EDEFAULT);

-			return;

-		case NattableaxisPackage.ID_AXIS__ELEMENT:

-			setElement(ELEMENT_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.ID_AXIS__MANAGER:

+				setManager((AxisManagerRepresentation)null);

+				return;

+			case NattableaxisPackage.ID_AXIS__ALIAS:

+				setAlias(ALIAS_EDEFAULT);

+				return;

+			case NattableaxisPackage.ID_AXIS__ELEMENT:

+				setElement(ELEMENT_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -297,18 +273,17 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.ID_AXIS__MANAGER:

-			return manager != null;

-		case NattableaxisPackage.ID_AXIS__ALIAS:

-			return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

-		case NattableaxisPackage.ID_AXIS__ELEMENT:

-			return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);

+		switch (featureID) {

+			case NattableaxisPackage.ID_AXIS__MANAGER:

+				return manager != null;

+			case NattableaxisPackage.ID_AXIS__ALIAS:

+				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

+			case NattableaxisPackage.ID_AXIS__ELEMENT:

+				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -316,14 +291,13 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch(operationID) {

-		case NattableaxisPackage.ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION:

-			return getLocalLabelConfiguration();

+		switch (operationID) {

+			case NattableaxisPackage.ID_AXIS___GET_LOCAL_LABEL_CONFIGURATION:

+				return getLocalLabelConfiguration();

 		}

 		return super.eInvoke(operationID, arguments);

 	}

@@ -331,14 +305,12 @@ public abstract class IdAxisImpl extends StyledElementImpl implements IdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (alias: "); //$NON-NLS-1$

 		result.append(alias);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java
index 2557d198164..f94403409da 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdTreeItemAxisImpl.java
@@ -32,12 +32,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#getChildren <em>Children</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#getParent <em>Parent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.IdTreeItemAxisImpl#getChildren <em>Children</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -47,7 +47,6 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getParent()

 	 * @generated

 	 * @ordered

@@ -58,7 +57,6 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -69,7 +67,6 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -80,7 +77,6 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getChildren()

 	 * @generated

 	 * @ordered

@@ -90,7 +86,6 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected IdTreeItemAxisImpl() {

@@ -100,7 +95,6 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -111,18 +105,16 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public ITreeItemAxis getParent() {

-		if(parent != null && parent.eIsProxy()) {

+		if (parent != null && parent.eIsProxy()) {

 			InternalEObject oldParent = (InternalEObject)parent;

 			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if(parent != oldParent) {

-				if(eNotificationRequired()) {

+			if (parent != oldParent) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-				}

 			}

 		}

 		return parent;

@@ -131,7 +123,6 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ITreeItemAxis basicGetParent() {

@@ -141,19 +132,14 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

 		ITreeItemAxis oldParent = parent;

 		parent = newParent;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -161,32 +147,26 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setParent(ITreeItemAxis newParent) {

-		if(newParent != parent) {

+		if (newParent != parent) {

 			NotificationChain msgs = null;

-			if(parent != null) {

+			if (parent != null)

 				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			if(newParent != null) {

+			if (newParent != null)

 				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

 			msgs = basicSetParent(newParent, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -197,27 +177,24 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setExpanded(boolean newExpanded) {

 		boolean oldExpanded = expanded;

 		expanded = newExpanded;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<ITreeItemAxis> getChildren() {

-		if(children == null) {

+		if (children == null) {

 			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

 		}

 		return children;

@@ -226,20 +203,18 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-			if(parent != null) {

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

+				if (parent != null)

+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

 		}

 		return super.eInverseAdd(otherEnd, featureID, msgs);

 	}

@@ -247,16 +222,15 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-			return basicSetParent(null, msgs);

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

+				return basicSetParent(null, msgs);

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -264,21 +238,18 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-			if(resolve) {

-				return getParent();

-			}

-			return basicGetParent();

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

-			return isExpanded();

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-			return getChildren();

+		switch (featureID) {

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

+				if (resolve) return getParent();

+				return basicGetParent();

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

+				return isExpanded();

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

+				return getChildren();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -286,23 +257,22 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)newValue);

-			return;

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded((Boolean)newValue);

-			return;

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)newValue);

+				return;

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded((Boolean)newValue);

+				return;

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -310,21 +280,20 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)null);

-			return;

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded(EXPANDED_EDEFAULT);

-			return;

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)null);

+				return;

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded(EXPANDED_EDEFAULT);

+				return;

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -332,18 +301,17 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-			return parent != null;

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

-			return expanded != EXPANDED_EDEFAULT;

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-			return children != null && !children.isEmpty();

+		switch (featureID) {

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

+				return parent != null;

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

+				return expanded != EXPANDED_EDEFAULT;

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

+				return children != null && !children.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -351,21 +319,16 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(derivedFeatureID) {

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (derivedFeatureID) {

+				case NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

@@ -374,21 +337,16 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(baseFeatureID) {

-			case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (baseFeatureID) {

+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ID_TREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ID_TREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ID_TREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

@@ -397,14 +355,12 @@ public class IdTreeItemAxisImpl extends IdAxisImpl implements IdTreeItemAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (expanded: "); //$NON-NLS-1$

 		result.append(expanded);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
index 380e28b18e2..12e9fbf68dc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
@@ -17,26 +17,12 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;

 

 /**

  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattableaxisFactoryImpl extends EFactoryImpl implements NattableaxisFactory {

@@ -45,16 +31,16 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static NattableaxisFactory init() {

 		try {

 			NattableaxisFactory theNattableaxisFactory = (NattableaxisFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisPackage.eNS_URI);

-			if(theNattableaxisFactory != null) {

+			if (theNattableaxisFactory != null) {

 				return theNattableaxisFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new NattableaxisFactoryImpl();

@@ -64,7 +50,6 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableaxisFactoryImpl() {

@@ -74,45 +59,31 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS:

-			return createIdTreeItemAxis();

-		case NattableaxisPackage.EOBJECT_AXIS:

-			return createEObjectAxis();

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS:

-			return createEObjectTreeItemAxis();

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS:

-			return createFeatureTreeItemAxis();

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS:

-			return createObjectTreeItemAxis();

-		case NattableaxisPackage.FEATURE_ID_AXIS:

-			return createFeatureIdAxis();

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS:

-			return createFeatureIdTreeItemAxis();

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS:

-			return createEStructuralFeatureAxis();

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS:

-			return createEStructuralFeatureTreeItemAxis();

-		case NattableaxisPackage.OBJECT_ID_AXIS:

-			return createObjectIdAxis();

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS:

-			return createObjectIdTreeItemAxis();

-		case NattableaxisPackage.AXIS_GROUP:

-			return createAxisGroup();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eClass.getClassifierID()) {

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS: return createIdTreeItemAxis();

+			case NattableaxisPackage.EOBJECT_AXIS: return createEObjectAxis();

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS: return createEObjectTreeItemAxis();

+			case NattableaxisPackage.FEATURE_ID_AXIS: return createFeatureIdAxis();

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS: return createFeatureIdTreeItemAxis();

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS: return createEStructuralFeatureAxis();

+			case NattableaxisPackage.EOPERATION_AXIS: return createEOperationAxis();

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS: return createEStructuralFeatureTreeItemAxis();

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS: return createEOperationTreeItemAxis();

+			case NattableaxisPackage.OBJECT_ID_AXIS: return createObjectIdAxis();

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS: return createObjectIdTreeItemAxis();

+			case NattableaxisPackage.AXIS_GROUP: return createAxisGroup();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -124,7 +95,6 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -136,7 +106,6 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -148,79 +117,70 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

-	public FeatureTreeItemAxis createFeatureTreeItemAxis() {

-		FeatureTreeItemAxisImpl featureTreeItemAxis = new FeatureTreeItemAxisImpl();

-		return featureTreeItemAxis;

+	public FeatureIdAxis createFeatureIdAxis() {

+		FeatureIdAxisImpl featureIdAxis = new FeatureIdAxisImpl();

+		return featureIdAxis;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

-	public ObjectTreeItemAxis createObjectTreeItemAxis() {

-		ObjectTreeItemAxisImpl objectTreeItemAxis = new ObjectTreeItemAxisImpl();

-		return objectTreeItemAxis;

+	public FeatureIdTreeItemAxis createFeatureIdTreeItemAxis() {

+		FeatureIdTreeItemAxisImpl featureIdTreeItemAxis = new FeatureIdTreeItemAxisImpl();

+		return featureIdTreeItemAxis;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

-	public FeatureIdAxis createFeatureIdAxis() {

-		FeatureIdAxisImpl featureIdAxis = new FeatureIdAxisImpl();

-		return featureIdAxis;

+	public EStructuralFeatureAxis createEStructuralFeatureAxis() {

+		EStructuralFeatureAxisImpl eStructuralFeatureAxis = new EStructuralFeatureAxisImpl();

+		return eStructuralFeatureAxis;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	@Override

-	public FeatureIdTreeItemAxis createFeatureIdTreeItemAxis() {

-		FeatureIdTreeItemAxisImpl featureIdTreeItemAxis = new FeatureIdTreeItemAxisImpl();

-		return featureIdTreeItemAxis;

+	public EOperationAxis createEOperationAxis() {

+		EOperationAxisImpl eOperationAxis = new EOperationAxisImpl();

+		return eOperationAxis;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

-	public EStructuralFeatureAxis createEStructuralFeatureAxis() {

-		EStructuralFeatureAxisImpl eStructuralFeatureAxis = new EStructuralFeatureAxisImpl();

-		return eStructuralFeatureAxis;

+	public EStructuralFeatureTreeItemAxis createEStructuralFeatureTreeItemAxis() {

+		EStructuralFeatureTreeItemAxisImpl eStructuralFeatureTreeItemAxis = new EStructuralFeatureTreeItemAxisImpl();

+		return eStructuralFeatureTreeItemAxis;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	@Override

-	public EStructuralFeatureTreeItemAxis createEStructuralFeatureTreeItemAxis() {

-		EStructuralFeatureTreeItemAxisImpl eStructuralFeatureTreeItemAxis = new EStructuralFeatureTreeItemAxisImpl();

-		return eStructuralFeatureTreeItemAxis;

+	public EOperationTreeItemAxis createEOperationTreeItemAxis() {

+		EOperationTreeItemAxisImpl eOperationTreeItemAxis = new EOperationTreeItemAxisImpl();

+		return eOperationTreeItemAxis;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -232,7 +192,6 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -244,7 +203,6 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -256,7 +214,6 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -267,7 +224,6 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
index f8327356562..38dc3e714ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
@@ -24,6 +24,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImp
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

@@ -40,6 +42,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis;

 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;

@@ -61,7 +65,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattableaxisPackageImpl extends EPackageImpl implements NattableaxisPackage {

@@ -69,7 +72,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass iAxisEClass = null;

@@ -77,7 +79,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass iTreeItemAxisEClass = null;

@@ -85,7 +86,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass idAxisEClass = null;

@@ -93,7 +93,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass idTreeItemAxisEClass = null;

@@ -101,7 +100,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass eObjectAxisEClass = null;

@@ -109,7 +107,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass eObjectTreeItemAxisEClass = null;

@@ -117,7 +114,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass featureAxisEClass = null;

@@ -125,7 +121,13 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @generated

+	 */

+	private EClass operationAxisEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	private EClass featureTreeItemAxisEClass = null;

@@ -133,7 +135,13 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @generated

+	 */

+	private EClass operationTreeItemAxisEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	private EClass objectAxisEClass = null;

@@ -141,7 +149,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass objectTreeItemAxisEClass = null;

@@ -149,7 +156,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass featureIdAxisEClass = null;

@@ -157,7 +163,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass featureIdTreeItemAxisEClass = null;

@@ -165,7 +170,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass eStructuralFeatureAxisEClass = null;

@@ -173,7 +177,13 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @generated

+	 */

+	private EClass eOperationAxisEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	private EClass eStructuralFeatureTreeItemAxisEClass = null;

@@ -181,7 +191,13 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @generated

+	 */

+	private EClass eOperationTreeItemAxisEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	private EClass objectIdAxisEClass = null;

@@ -189,7 +205,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass objectIdTreeItemAxisEClass = null;

@@ -197,19 +212,19 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass axisGroupEClass = null;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

 	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#eNS_URI

 	 * @see #init()

@@ -222,32 +237,32 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link NattableaxisPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * 

+	 * <p>This method is used to initialize {@link NattableaxisPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static NattableaxisPackage init() {

-		if(isInited) {

-			return (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);

-		}

+		if (isInited) return (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);

+

 		// Obtain or create and register package

 		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisPackageImpl());

+

 		isInited = true;

+

 		// Initialize simple dependencies

 		EcorePackage.eINSTANCE.eClass();

+

 		// Obtain or create and register interdependencies

 		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

 		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

@@ -258,6 +273,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

 		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

 		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

+

 		// Create package meta-data objects

 		theNattableaxisPackage.createPackageContents();

 		theNattablePackage.createPackageContents();

@@ -269,6 +285,7 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 		theNattablecellPackage.createPackageContents();

 		theNattableproblemPackage.createPackageContents();

 		theNattablestylePackage.createPackageContents();

+

 		// Initialize created meta-data

 		theNattableaxisPackage.initializePackageContents();

 		theNattablePackage.initializePackageContents();

@@ -280,8 +297,11 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 		theNattablecellPackage.initializePackageContents();

 		theNattableproblemPackage.initializePackageContents();

 		theNattablestylePackage.initializePackageContents();

+

 		// Mark meta-data to indicate it can't be changed

 		theNattableaxisPackage.freeze();

+

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(NattableaxisPackage.eNS_URI, theNattableaxisPackage);

 		return theNattableaxisPackage;

@@ -290,7 +310,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -301,7 +320,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -312,7 +330,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -323,7 +340,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -334,7 +350,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -345,7 +360,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -356,7 +370,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -367,7 +380,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -378,7 +390,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -389,7 +400,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -400,7 +410,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -411,7 +420,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -422,7 +430,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -433,7 +440,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -444,7 +450,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -455,7 +460,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -466,7 +470,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -477,7 +480,24 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @generated

+	 */

+	public EClass getOperationAxis() {

+		return operationAxisEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getOperationAxis_LocalLabelConfiguration() {

+		return (EReference)operationAxisEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

@@ -488,7 +508,15 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @generated

+	 */

+	public EClass getOperationTreeItemAxis() {

+		return operationTreeItemAxisEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

@@ -499,7 +527,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -510,7 +537,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -521,7 +547,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -532,7 +557,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -543,7 +567,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -554,7 +577,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -565,7 +587,24 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @generated

+	 */

+	public EClass getEOperationAxis() {

+		return eOperationAxisEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getEOperationAxis_Element() {

+		return (EReference)eOperationAxisEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

@@ -576,7 +615,15 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @generated

+	 */

+	public EClass getEOperationTreeItemAxis() {

+		return eOperationTreeItemAxisEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

@@ -587,7 +634,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -598,7 +644,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -609,7 +654,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -620,7 +664,6 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -631,53 +674,76 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package. This method is

+	 * Creates the meta-model objects for the package.  This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated) {

-			return;

-		}

+		if (isCreated) return;

 		isCreated = true;

+

 		// Create classes and their features

 		iAxisEClass = createEClass(IAXIS);

 		createEReference(iAxisEClass, IAXIS__MANAGER);

 		createEAttribute(iAxisEClass, IAXIS__ALIAS);

 		createEOperation(iAxisEClass, IAXIS___GET_ELEMENT);

 		createEOperation(iAxisEClass, IAXIS___GET_LOCAL_LABEL_CONFIGURATION);

+

 		iTreeItemAxisEClass = createEClass(ITREE_ITEM_AXIS);

 		createEReference(iTreeItemAxisEClass, ITREE_ITEM_AXIS__PARENT);

 		createEAttribute(iTreeItemAxisEClass, ITREE_ITEM_AXIS__EXPANDED);

 		createEReference(iTreeItemAxisEClass, ITREE_ITEM_AXIS__CHILDREN);

+

 		idAxisEClass = createEClass(ID_AXIS);

 		createEAttribute(idAxisEClass, ID_AXIS__ELEMENT);

+

 		idTreeItemAxisEClass = createEClass(ID_TREE_ITEM_AXIS);

+

 		eObjectAxisEClass = createEClass(EOBJECT_AXIS);

 		createEReference(eObjectAxisEClass, EOBJECT_AXIS__ELEMENT);

+

 		eObjectTreeItemAxisEClass = createEClass(EOBJECT_TREE_ITEM_AXIS);

+

 		featureAxisEClass = createEClass(FEATURE_AXIS);

 		createEReference(featureAxisEClass, FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION);

+

+		operationAxisEClass = createEClass(OPERATION_AXIS);

+		createEReference(operationAxisEClass, OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION);

+

 		featureTreeItemAxisEClass = createEClass(FEATURE_TREE_ITEM_AXIS);

+

+		operationTreeItemAxisEClass = createEClass(OPERATION_TREE_ITEM_AXIS);

+

 		objectAxisEClass = createEClass(OBJECT_AXIS);

 		createEReference(objectAxisEClass, OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION);

+

 		objectTreeItemAxisEClass = createEClass(OBJECT_TREE_ITEM_AXIS);

+

 		featureIdAxisEClass = createEClass(FEATURE_ID_AXIS);

+

 		featureIdTreeItemAxisEClass = createEClass(FEATURE_ID_TREE_ITEM_AXIS);

+

 		eStructuralFeatureAxisEClass = createEClass(ESTRUCTURAL_FEATURE_AXIS);

 		createEReference(eStructuralFeatureAxisEClass, ESTRUCTURAL_FEATURE_AXIS__ELEMENT);

+

+		eOperationAxisEClass = createEClass(EOPERATION_AXIS);

+		createEReference(eOperationAxisEClass, EOPERATION_AXIS__ELEMENT);

+

 		eStructuralFeatureTreeItemAxisEClass = createEClass(ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS);

+

+		eOperationTreeItemAxisEClass = createEClass(EOPERATION_TREE_ITEM_AXIS);

+

 		objectIdAxisEClass = createEClass(OBJECT_ID_AXIS);

+

 		objectIdTreeItemAxisEClass = createEClass(OBJECT_ID_TREE_ITEM_AXIS);

+

 		axisGroupEClass = createEClass(AXIS_GROUP);

 		createEReference(axisGroupEClass, AXIS_GROUP__GROUPED_AXIS);

 	}

@@ -685,34 +751,35 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model. This

+	 * Complete the initialization of the package and its meta-model.  This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized) {

-			return;

-		}

+		if (isInitialized) return;

 		isInitialized = true;

+

 		// Initialize package

 		setName(eNAME);

 		setNsPrefix(eNS_PREFIX);

 		setNsURI(eNS_URI);

+

 		// Obtain other dependent packages

 		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

 		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);

 		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);

+

 		// Create type parameters

+

 		// Set bounds for type parameters

+

 		// Add supertypes to classes

 		iAxisEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());

 		iTreeItemAxisEClass.getESuperTypes().add(this.getIAxis());

@@ -723,8 +790,11 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 		eObjectTreeItemAxisEClass.getESuperTypes().add(this.getEObjectAxis());

 		eObjectTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

 		featureAxisEClass.getESuperTypes().add(this.getIAxis());

+		operationAxisEClass.getESuperTypes().add(this.getIAxis());

 		featureTreeItemAxisEClass.getESuperTypes().add(this.getFeatureAxis());

 		featureTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

+		operationTreeItemAxisEClass.getESuperTypes().add(this.getOperationAxis());

+		operationTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

 		objectAxisEClass.getESuperTypes().add(this.getIAxis());

 		objectTreeItemAxisEClass.getESuperTypes().add(this.getObjectAxis());

 		objectTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

@@ -733,42 +803,74 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 		featureIdTreeItemAxisEClass.getESuperTypes().add(this.getFeatureIdAxis());

 		featureIdTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

 		eStructuralFeatureAxisEClass.getESuperTypes().add(this.getFeatureAxis());

+		eOperationAxisEClass.getESuperTypes().add(this.getOperationAxis());

 		eStructuralFeatureTreeItemAxisEClass.getESuperTypes().add(this.getEStructuralFeatureAxis());

 		eStructuralFeatureTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

+		eOperationTreeItemAxisEClass.getESuperTypes().add(this.getEOperationAxis());

+		eOperationTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

 		objectIdAxisEClass.getESuperTypes().add(this.getIdAxis());

 		objectIdAxisEClass.getESuperTypes().add(this.getObjectAxis());

 		objectIdTreeItemAxisEClass.getESuperTypes().add(this.getObjectIdAxis());

 		objectIdTreeItemAxisEClass.getESuperTypes().add(this.getITreeItemAxis());

 		axisGroupEClass.getESuperTypes().add(this.getIAxis());

+

 		// Initialize classes, features, and operations; add parameters

 		initEClass(iAxisEClass, IAxis.class, "IAxis", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getIAxis_Manager(), theNattableaxisconfigurationPackage.getAxisManagerRepresentation(), null, "manager", null, 1, 1, IAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEAttribute(getIAxis_Alias(), ecorePackage.getEString(), "alias", null, 0, 1, IAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEOperation(getIAxis__GetElement(), ecorePackage.getEJavaObject(), "getElement", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

+

 		initEOperation(getIAxis__GetLocalLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), "getLocalLabelConfiguration", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(iTreeItemAxisEClass, ITreeItemAxis.class, "ITreeItemAxis", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getITreeItemAxis_Parent(), this.getITreeItemAxis(), this.getITreeItemAxis_Children(), "parent", null, 0, 1, ITreeItemAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEAttribute(getITreeItemAxis_Expanded(), ecorePackage.getEBoolean(), "expanded", "false", 1, 1, ITreeItemAxis.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

 		initEReference(getITreeItemAxis_Children(), this.getITreeItemAxis(), this.getITreeItemAxis_Parent(), "children", null, 0, -1, ITreeItemAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(idAxisEClass, IdAxis.class, "IdAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getIdAxis_Element(), ecorePackage.getEString(), "element", null, 1, 1, IdAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(idTreeItemAxisEClass, IdTreeItemAxis.class, "IdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(eObjectAxisEClass, EObjectAxis.class, "EObjectAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getEObjectAxis_Element(), ecorePackage.getEObject(), null, "element", null, 1, 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(eObjectTreeItemAxisEClass, EObjectTreeItemAxis.class, "EObjectTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(featureAxisEClass, FeatureAxis.class, "FeatureAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getFeatureAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getFeatureLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, FeatureAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEClass(featureTreeItemAxisEClass, FeatureTreeItemAxis.class, "FeatureTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(operationAxisEClass, OperationAxis.class, "OperationAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+		initEReference(getOperationAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getOperationLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, OperationAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

+		initEClass(featureTreeItemAxisEClass, FeatureTreeItemAxis.class, "FeatureTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(operationTreeItemAxisEClass, OperationTreeItemAxis.class, "OperationTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(objectAxisEClass, ObjectAxis.class, "ObjectAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getObjectAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getObjectLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, ObjectAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEClass(objectTreeItemAxisEClass, ObjectTreeItemAxis.class, "ObjectTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(objectTreeItemAxisEClass, ObjectTreeItemAxis.class, "ObjectTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(featureIdAxisEClass, FeatureIdAxis.class, "FeatureIdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(featureIdTreeItemAxisEClass, FeatureIdTreeItemAxis.class, "FeatureIdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(eStructuralFeatureAxisEClass, EStructuralFeatureAxis.class, "EStructuralFeatureAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getEStructuralFeatureAxis_Element(), ecorePackage.getEStructuralFeature(), null, "element", null, 1, 1, EStructuralFeatureAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

+		initEClass(eOperationAxisEClass, EOperationAxis.class, "EOperationAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+		initEReference(getEOperationAxis_Element(), ecorePackage.getEOperation(), null, "element", null, 1, 1, EOperationAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(eStructuralFeatureTreeItemAxisEClass, EStructuralFeatureTreeItemAxis.class, "EStructuralFeatureTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(eOperationTreeItemAxisEClass, EOperationTreeItemAxis.class, "EOperationTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(objectIdAxisEClass, ObjectIdAxis.class, "ObjectIdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(objectIdTreeItemAxisEClass, ObjectIdTreeItemAxis.class, "ObjectIdTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(axisGroupEClass, AxisGroup.class, "AxisGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getAxisGroup_GroupedAxis(), this.getIAxis(), null, "groupedAxis", null, 0, -1, AxisGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
index 56ae15a6095..724c4e096d8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
@@ -32,13 +32,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getManager <em>Manager</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getAlias <em>Alias</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getLocalLabelConfiguration <em>Local Label

- * Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getManager <em>Manager</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getAlias <em>Alias</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -48,7 +47,6 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getManager()

 	 * @generated

 	 * @ordered

@@ -59,7 +57,6 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAlias()

 	 * @generated

 	 * @ordered

@@ -70,7 +67,6 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAlias()

 	 * @generated

 	 * @ordered

@@ -81,7 +77,6 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLocalLabelConfiguration()

 	 * @generated

 	 * @ordered

@@ -91,7 +86,6 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ObjectAxisImpl() {

@@ -101,7 +95,6 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -112,18 +105,16 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public AxisManagerRepresentation getManager() {

-		if(manager != null && manager.eIsProxy()) {

+		if (manager != null && manager.eIsProxy()) {

 			InternalEObject oldManager = (InternalEObject)manager;

 			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);

-			if(manager != oldManager) {

-				if(eNotificationRequired()) {

+			if (manager != oldManager) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_AXIS__MANAGER, oldManager, manager));

-				}

 			}

 		}

 		return manager;

@@ -132,7 +123,6 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public AxisManagerRepresentation basicGetManager() {

@@ -142,22 +132,19 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setManager(AxisManagerRepresentation newManager) {

 		AxisManagerRepresentation oldManager = manager;

 		manager = newManager;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__MANAGER, oldManager, manager));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -168,22 +155,19 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setAlias(String newAlias) {

 		String oldAlias = alias;

 		alias = newAlias;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__ALIAS, oldAlias, alias));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -194,19 +178,14 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

 		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

 		localLabelConfiguration = newLocalLabelConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -214,32 +193,26 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {

-		if(newLocalLabelConfiguration != localLabelConfiguration) {

+		if (newLocalLabelConfiguration != localLabelConfiguration) {

 			NotificationChain msgs = null;

-			if(localLabelConfiguration != null) {

+			if (localLabelConfiguration != null)

 				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			}

-			if(newLocalLabelConfiguration != null) {

+			if (newLocalLabelConfiguration != null)

 				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			}

 			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -252,14 +225,13 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return basicSetLocalLabelConfiguration(null, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return basicSetLocalLabelConfiguration(null, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -267,21 +239,18 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-			if(resolve) {

-				return getManager();

-			}

-			return basicGetManager();

-		case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-			return getAlias();

-		case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return getLocalLabelConfiguration();

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

+				if (resolve) return getManager();

+				return basicGetManager();

+			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

+				return getAlias();

+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return getLocalLabelConfiguration();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -289,21 +258,20 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-			setManager((AxisManagerRepresentation)newValue);

-			return;

-		case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-			setAlias((String)newValue);

-			return;

-		case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-			setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

+				setManager((AxisManagerRepresentation)newValue);

+				return;

+			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

+				setAlias((String)newValue);

+				return;

+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

+				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -311,21 +279,20 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-			setManager((AxisManagerRepresentation)null);

-			return;

-		case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-			setAlias(ALIAS_EDEFAULT);

-			return;

-		case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-			setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

+				setManager((AxisManagerRepresentation)null);

+				return;

+			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

+				setAlias(ALIAS_EDEFAULT);

+				return;

+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

+				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -333,18 +300,17 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-			return manager != null;

-		case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-			return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

-		case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return localLabelConfiguration != null;

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

+				return manager != null;

+			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

+				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

+			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return localLabelConfiguration != null;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -352,14 +318,13 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch(operationID) {

-		case NattableaxisPackage.OBJECT_AXIS___GET_ELEMENT:

-			return getElement();

+		switch (operationID) {

+			case NattableaxisPackage.OBJECT_AXIS___GET_ELEMENT:

+				return getElement();

 		}

 		return super.eInvoke(operationID, arguments);

 	}

@@ -367,14 +332,12 @@ public abstract class ObjectAxisImpl extends StyledElementImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (alias: "); //$NON-NLS-1$

 		result.append(alias);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
index f8b28bf2e97..9952edd79b1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
@@ -28,11 +28,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.O
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl#getLocalLabelConfiguration <em>Local Label

- * Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -42,7 +41,6 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLocalLabelConfiguration()

 	 * @generated

 	 * @ordered

@@ -52,7 +50,6 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ObjectIdAxisImpl() {

@@ -62,7 +59,6 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -73,7 +69,6 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -84,19 +79,14 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

 		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

 		localLabelConfiguration = newLocalLabelConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -104,39 +94,33 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {

-		if(newLocalLabelConfiguration != localLabelConfiguration) {

+		if (newLocalLabelConfiguration != localLabelConfiguration) {

 			NotificationChain msgs = null;

-			if(localLabelConfiguration != null) {

+			if (localLabelConfiguration != null)

 				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			}

-			if(newLocalLabelConfiguration != null) {

+			if (newLocalLabelConfiguration != null)

 				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			}

 			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return basicSetLocalLabelConfiguration(null, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return basicSetLocalLabelConfiguration(null, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -144,14 +128,13 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return getLocalLabelConfiguration();

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return getLocalLabelConfiguration();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -159,15 +142,14 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-			setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

+				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -175,15 +157,14 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-			setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

+				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -191,14 +172,13 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-			return localLabelConfiguration != null;

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return localLabelConfiguration != null;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -206,17 +186,14 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if(baseClass == ObjectAxis.class) {

-			switch(derivedFeatureID) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;

-			default:

-				return -1;

+		if (baseClass == ObjectAxis.class) {

+			switch (derivedFeatureID) {

+				case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;

+				default: return -1;

 			}

 		}

 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

@@ -225,17 +202,14 @@ public class ObjectIdAxisImpl extends IdAxisImpl implements ObjectIdAxis {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if(baseClass == ObjectAxis.class) {

-			switch(baseFeatureID) {

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

-			default:

-				return -1;

+		if (baseClass == ObjectAxis.class) {

+			switch (baseFeatureID) {

+				case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

+				default: return -1;

 			}

 		}

 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java
index 5610cd753b2..d6f3c5d283b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdTreeItemAxisImpl.java
@@ -32,12 +32,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTr
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#getChildren <em>Children</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#getParent <em>Parent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectIdTreeItemAxisImpl#getChildren <em>Children</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -47,7 +47,6 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getParent()

 	 * @generated

 	 * @ordered

@@ -58,7 +57,6 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -69,7 +67,6 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -80,7 +77,6 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getChildren()

 	 * @generated

 	 * @ordered

@@ -90,7 +86,6 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ObjectIdTreeItemAxisImpl() {

@@ -100,7 +95,6 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -111,18 +105,16 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public ITreeItemAxis getParent() {

-		if(parent != null && parent.eIsProxy()) {

+		if (parent != null && parent.eIsProxy()) {

 			InternalEObject oldParent = (InternalEObject)parent;

 			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if(parent != oldParent) {

-				if(eNotificationRequired()) {

+			if (parent != oldParent) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-				}

 			}

 		}

 		return parent;

@@ -131,7 +123,6 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ITreeItemAxis basicGetParent() {

@@ -141,19 +132,14 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

 		ITreeItemAxis oldParent = parent;

 		parent = newParent;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -161,32 +147,26 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setParent(ITreeItemAxis newParent) {

-		if(newParent != parent) {

+		if (newParent != parent) {

 			NotificationChain msgs = null;

-			if(parent != null) {

+			if (parent != null)

 				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			if(newParent != null) {

+			if (newParent != null)

 				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

 			msgs = basicSetParent(newParent, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT, newParent, newParent));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -197,27 +177,24 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setExpanded(boolean newExpanded) {

 		boolean oldExpanded = expanded;

 		expanded = newExpanded;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<ITreeItemAxis> getChildren() {

-		if(children == null) {

+		if (children == null) {

 			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

 		}

 		return children;

@@ -226,20 +203,18 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-			if(parent != null) {

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

+				if (parent != null)

+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

 		}

 		return super.eInverseAdd(otherEnd, featureID, msgs);

 	}

@@ -247,16 +222,15 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-			return basicSetParent(null, msgs);

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

+				return basicSetParent(null, msgs);

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -264,21 +238,18 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-			if(resolve) {

-				return getParent();

-			}

-			return basicGetParent();

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

-			return isExpanded();

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-			return getChildren();

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

+				if (resolve) return getParent();

+				return basicGetParent();

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

+				return isExpanded();

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

+				return getChildren();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -286,23 +257,22 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)newValue);

-			return;

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded((Boolean)newValue);

-			return;

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)newValue);

+				return;

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded((Boolean)newValue);

+				return;

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -310,21 +280,20 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)null);

-			return;

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded(EXPANDED_EDEFAULT);

-			return;

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)null);

+				return;

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded(EXPANDED_EDEFAULT);

+				return;

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -332,18 +301,17 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-			return parent != null;

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

-			return expanded != EXPANDED_EDEFAULT;

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-			return children != null && !children.isEmpty();

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

+				return parent != null;

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

+				return expanded != EXPANDED_EDEFAULT;

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

+				return children != null && !children.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -351,21 +319,16 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(derivedFeatureID) {

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (derivedFeatureID) {

+				case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

@@ -374,21 +337,16 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(baseFeatureID) {

-			case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (baseFeatureID) {

+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

@@ -397,14 +355,12 @@ public class ObjectIdTreeItemAxisImpl extends ObjectIdAxisImpl implements Object
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (expanded: "); //$NON-NLS-1$

 		result.append(expanded);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
index 71c89a093c6..a2afc4a1e38 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
@@ -32,22 +32,21 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTree
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#getParent <em>Parent</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#getChildren <em>Children</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#getParent <em>Parent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectTreeItemAxisImpl#getChildren <em>Children</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

-public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTreeItemAxis {

+public abstract class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTreeItemAxis {

 

 	/**

 	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getParent()

 	 * @generated

 	 * @ordered

@@ -58,7 +57,6 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -69,7 +67,6 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isExpanded()

 	 * @generated

 	 * @ordered

@@ -80,7 +77,6 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getChildren()

 	 * @generated

 	 * @ordered

@@ -90,7 +86,6 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ObjectTreeItemAxisImpl() {

@@ -100,7 +95,6 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -111,18 +105,16 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public ITreeItemAxis getParent() {

-		if(parent != null && parent.eIsProxy()) {

+		if (parent != null && parent.eIsProxy()) {

 			InternalEObject oldParent = (InternalEObject)parent;

 			parent = (ITreeItemAxis)eResolveProxy(oldParent);

-			if(parent != oldParent) {

-				if(eNotificationRequired()) {

+			if (parent != oldParent) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, oldParent, parent));

-				}

 			}

 		}

 		return parent;

@@ -131,7 +123,6 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ITreeItemAxis basicGetParent() {

@@ -141,19 +132,14 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

 		ITreeItemAxis oldParent = parent;

 		parent = newParent;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -161,32 +147,26 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setParent(ITreeItemAxis newParent) {

-		if(newParent != parent) {

+		if (newParent != parent) {

 			NotificationChain msgs = null;

-			if(parent != null) {

+			if (parent != null)

 				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			if(newParent != null) {

+			if (newParent != null)

 				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

 			msgs = basicSetParent(newParent, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT, newParent, newParent));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -197,27 +177,24 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setExpanded(boolean newExpanded) {

 		boolean oldExpanded = expanded;

 		expanded = newExpanded;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<ITreeItemAxis> getChildren() {

-		if(children == null) {

+		if (children == null) {

 			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

 		}

 		return children;

@@ -226,20 +203,18 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-			if(parent != null) {

-				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

-			}

-			return basicSetParent((ITreeItemAxis)otherEnd, msgs);

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

+				if (parent != null)

+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

 		}

 		return super.eInverseAdd(otherEnd, featureID, msgs);

 	}

@@ -247,16 +222,15 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-			return basicSetParent(null, msgs);

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-			return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

+				return basicSetParent(null, msgs);

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -264,21 +238,18 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-			if(resolve) {

-				return getParent();

-			}

-			return basicGetParent();

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

-			return isExpanded();

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-			return getChildren();

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

+				if (resolve) return getParent();

+				return basicGetParent();

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

+				return isExpanded();

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

+				return getChildren();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -286,23 +257,22 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)newValue);

-			return;

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded((Boolean)newValue);

-			return;

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)newValue);

+				return;

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded((Boolean)newValue);

+				return;

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -310,21 +280,20 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-			setParent((ITreeItemAxis)null);

-			return;

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

-			setExpanded(EXPANDED_EDEFAULT);

-			return;

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-			getChildren().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)null);

+				return;

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded(EXPANDED_EDEFAULT);

+				return;

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -332,18 +301,17 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-			return parent != null;

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

-			return expanded != EXPANDED_EDEFAULT;

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-			return children != null && !children.isEmpty();

+		switch (featureID) {

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

+				return parent != null;

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

+				return expanded != EXPANDED_EDEFAULT;

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

+				return children != null && !children.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -351,21 +319,16 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(derivedFeatureID) {

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (derivedFeatureID) {

+				case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

@@ -374,21 +337,16 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if(baseClass == ITreeItemAxis.class) {

-			switch(baseFeatureID) {

-			case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT:

-				return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED:

-				return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED;

-			case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN:

-				return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN;

-			default:

-				return -1;

+		if (baseClass == ITreeItemAxis.class) {

+			switch (baseFeatureID) {

+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.OBJECT_TREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

 			}

 		}

 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

@@ -397,14 +355,12 @@ public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTree
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (expanded: "); //$NON-NLS-1$

 		result.append(expanded);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationAxisImpl.java
new file mode 100644
index 00000000000..a3488bbc264
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationAxisImpl.java
@@ -0,0 +1,347 @@
+/**

+ * 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.nattableaxis.impl;

+

+import java.lang.reflect.InvocationTargetException;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Operation Axis</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl#getManager <em>Manager</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl#getAlias <em>Alias</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationAxisImpl#getLocalLabelConfiguration <em>Local Label Configuration</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public abstract class OperationAxisImpl extends StyledElementImpl implements OperationAxis {

+	/**

+	 * The cached value of the '{@link #getManager() <em>Manager</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getManager()

+	 * @generated

+	 * @ordered

+	 */

+	protected AxisManagerRepresentation manager;

+

+	/**

+	 * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getAlias()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String ALIAS_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getAlias()

+	 * @generated

+	 * @ordered

+	 */

+	protected String alias = ALIAS_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getLocalLabelConfiguration() <em>Local Label Configuration</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getLocalLabelConfiguration()

+	 * @generated

+	 * @ordered

+	 */

+	protected OperationLabelProviderConfiguration localLabelConfiguration;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected OperationAxisImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return NattableaxisPackage.Literals.OPERATION_AXIS;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public AxisManagerRepresentation getManager() {

+		if (manager != null && manager.eIsProxy()) {

+			InternalEObject oldManager = (InternalEObject)manager;

+			manager = (AxisManagerRepresentation)eResolveProxy(oldManager);

+			if (manager != oldManager) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OPERATION_AXIS__MANAGER, oldManager, manager));

+			}

+		}

+		return manager;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public AxisManagerRepresentation basicGetManager() {

+		return manager;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setManager(AxisManagerRepresentation newManager) {

+		AxisManagerRepresentation oldManager = manager;

+		manager = newManager;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__MANAGER, oldManager, manager));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getAlias() {

+		return alias;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setAlias(String newAlias) {

+		String oldAlias = alias;

+		alias = newAlias;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__ALIAS, oldAlias, alias));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public OperationLabelProviderConfiguration getLocalLabelConfiguration() {

+		return localLabelConfiguration;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetLocalLabelConfiguration(OperationLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

+		OperationLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

+		localLabelConfiguration = newLocalLabelConfiguration;

+		if (eNotificationRequired()) {

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setLocalLabelConfiguration(OperationLabelProviderConfiguration newLocalLabelConfiguration) {

+		if (newLocalLabelConfiguration != localLabelConfiguration) {

+			NotificationChain msgs = null;

+			if (localLabelConfiguration != null)

+				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

+			if (newLocalLabelConfiguration != null)

+				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

+			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Object getElement() {

+		// TODO: implement this method

+		// Ensure that you remove @generated or mark it @generated NOT

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return basicSetLocalLabelConfiguration(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 NattableaxisPackage.OPERATION_AXIS__MANAGER:

+				if (resolve) return getManager();

+				return basicGetManager();

+			case NattableaxisPackage.OPERATION_AXIS__ALIAS:

+				return getAlias();

+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return getLocalLabelConfiguration();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case NattableaxisPackage.OPERATION_AXIS__MANAGER:

+				setManager((AxisManagerRepresentation)newValue);

+				return;

+			case NattableaxisPackage.OPERATION_AXIS__ALIAS:

+				setAlias((String)newValue);

+				return;

+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

+				setLocalLabelConfiguration((OperationLabelProviderConfiguration)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case NattableaxisPackage.OPERATION_AXIS__MANAGER:

+				setManager((AxisManagerRepresentation)null);

+				return;

+			case NattableaxisPackage.OPERATION_AXIS__ALIAS:

+				setAlias(ALIAS_EDEFAULT);

+				return;

+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

+				setLocalLabelConfiguration((OperationLabelProviderConfiguration)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case NattableaxisPackage.OPERATION_AXIS__MANAGER:

+				return manager != null;

+			case NattableaxisPackage.OPERATION_AXIS__ALIAS:

+				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

+			case NattableaxisPackage.OPERATION_AXIS__LOCAL_LABEL_CONFIGURATION:

+				return localLabelConfiguration != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

+		switch (operationID) {

+			case NattableaxisPackage.OPERATION_AXIS___GET_ELEMENT:

+				return getElement();

+		}

+		return super.eInvoke(operationID, arguments);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (alias: "); //$NON-NLS-1$

+		result.append(alias);

+		result.append(')');

+		return result.toString();

+	}

+

+} //OperationAxisImpl

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationTreeItemAxisImpl.java
new file mode 100644
index 00000000000..e07f14d6ec2
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationTreeItemAxisImpl.java
@@ -0,0 +1,370 @@
+/**

+ * 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.nattableaxis.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Operation Tree Item Axis</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl#getParent <em>Parent</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl#isExpanded <em>Expanded</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.OperationTreeItemAxisImpl#getChildren <em>Children</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public abstract class OperationTreeItemAxisImpl extends OperationAxisImpl implements OperationTreeItemAxis {

+	/**

+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getParent()

+	 * @generated

+	 * @ordered

+	 */

+	protected ITreeItemAxis parent;

+

+	/**

+	 * The default value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isExpanded()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean EXPANDED_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isExpanded() <em>Expanded</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isExpanded()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean expanded = EXPANDED_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getChildren()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<ITreeItemAxis> children;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected OperationTreeItemAxisImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return NattableaxisPackage.Literals.OPERATION_TREE_ITEM_AXIS;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ITreeItemAxis getParent() {

+		if (parent != null && parent.eIsProxy()) {

+			InternalEObject oldParent = (InternalEObject)parent;

+			parent = (ITreeItemAxis)eResolveProxy(oldParent);

+			if (parent != oldParent) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT, oldParent, parent));

+			}

+		}

+		return parent;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ITreeItemAxis basicGetParent() {

+		return parent;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetParent(ITreeItemAxis newParent, NotificationChain msgs) {

+		ITreeItemAxis oldParent = parent;

+		parent = newParent;

+		if (eNotificationRequired()) {

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT, oldParent, newParent);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setParent(ITreeItemAxis newParent) {

+		if (newParent != parent) {

+			NotificationChain msgs = null;

+			if (parent != null)

+				msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+			if (newParent != null)

+				msgs = ((InternalEObject)newParent).eInverseAdd(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+			msgs = basicSetParent(newParent, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT, newParent, newParent));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isExpanded() {

+		return expanded;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setExpanded(boolean newExpanded) {

+		boolean oldExpanded = expanded;

+		expanded = newExpanded;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED, oldExpanded, expanded));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<ITreeItemAxis> getChildren() {

+		if (children == null) {

+			children = new EObjectWithInverseResolvingEList<ITreeItemAxis>(ITreeItemAxis.class, this, NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN, NattableaxisPackage.ITREE_ITEM_AXIS__PARENT);

+		}

+		return children;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

+				if (parent != null)

+					msgs = ((InternalEObject)parent).eInverseRemove(this, NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN, ITreeItemAxis.class, msgs);

+				return basicSetParent((ITreeItemAxis)otherEnd, msgs);

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

+				return basicSetParent(null, msgs);

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

+				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

+				if (resolve) return getParent();

+				return basicGetParent();

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:

+				return isExpanded();

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

+				return getChildren();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)newValue);

+				return;

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded((Boolean)newValue);

+				return;

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				getChildren().addAll((Collection<? extends ITreeItemAxis>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

+				setParent((ITreeItemAxis)null);

+				return;

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:

+				setExpanded(EXPANDED_EDEFAULT);

+				return;

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

+				getChildren().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT:

+				return parent != null;

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED:

+				return expanded != EXPANDED_EDEFAULT;

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN:

+				return children != null && !children.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

+		if (baseClass == ITreeItemAxis.class) {

+			switch (derivedFeatureID) {

+				case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT: return NattableaxisPackage.ITREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

+			}

+		}

+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

+		if (baseClass == ITreeItemAxis.class) {

+			switch (baseFeatureID) {

+				case NattableaxisPackage.ITREE_ITEM_AXIS__PARENT: return NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__PARENT;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__EXPANDED: return NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__EXPANDED;

+				case NattableaxisPackage.ITREE_ITEM_AXIS__CHILDREN: return NattableaxisPackage.OPERATION_TREE_ITEM_AXIS__CHILDREN;

+				default: return -1;

+			}

+		}

+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (expanded: "); //$NON-NLS-1$

+		result.append(expanded);

+		result.append(')');

+		return result.toString();

+	}

+

+} //OperationTreeItemAxisImpl

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
index 6adeed365d5..82c2da4d3f1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

@@ -42,7 +43,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage

  * @generated

  */

@@ -52,7 +52,6 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattableaxisPackage modelPackage;

@@ -61,11 +60,10 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableaxisAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattableaxisPackage.eINSTANCE;

 		}

 	}

@@ -75,16 +73,15 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

+		if (object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

@@ -94,119 +91,112 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NattableaxisSwitch<Adapter> modelSwitch = new NattableaxisSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseIAxis(IAxis object) {

-			return createIAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseITreeItemAxis(ITreeItemAxis object) {

-			return createITreeItemAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseIdAxis(IdAxis object) {

-			return createIdAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseIdTreeItemAxis(IdTreeItemAxis object) {

-			return createIdTreeItemAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseEObjectAxis(EObjectAxis object) {

-			return createEObjectAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseEObjectTreeItemAxis(EObjectTreeItemAxis object) {

-			return createEObjectTreeItemAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseFeatureAxis(FeatureAxis object) {

-			return createFeatureAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseFeatureTreeItemAxis(FeatureTreeItemAxis object) {

-			return createFeatureTreeItemAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseObjectAxis(ObjectAxis object) {

-			return createObjectAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseObjectTreeItemAxis(ObjectTreeItemAxis object) {

-			return createObjectTreeItemAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseFeatureIdAxis(FeatureIdAxis object) {

-			return createFeatureIdAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseFeatureIdTreeItemAxis(FeatureIdTreeItemAxis object) {

-			return createFeatureIdTreeItemAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseEStructuralFeatureAxis(EStructuralFeatureAxis object) {

-			return createEStructuralFeatureAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseEStructuralFeatureTreeItemAxis(EStructuralFeatureTreeItemAxis object) {

-			return createEStructuralFeatureTreeItemAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseObjectIdAxis(ObjectIdAxis object) {

-			return createObjectIdAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseObjectIdTreeItemAxis(ObjectIdTreeItemAxis object) {

-			return createObjectIdTreeItemAxisAdapter();

-		}

-

-		@Override

-		public Adapter caseAxisGroup(AxisGroup object) {

-			return createAxisGroupAdapter();

-		}

-

-		@Override

-		public Adapter caseEModelElement(EModelElement object) {

-			return createEModelElementAdapter();

-		}

-

-		@Override

-		public Adapter caseStyledElement(StyledElement object) {

-			return createStyledElementAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

+			@Override

+			public Adapter caseIAxis(IAxis object) {

+				return createIAxisAdapter();

+			}

+			@Override

+			public Adapter caseITreeItemAxis(ITreeItemAxis object) {

+				return createITreeItemAxisAdapter();

+			}

+			@Override

+			public Adapter caseIdAxis(IdAxis object) {

+				return createIdAxisAdapter();

+			}

+			@Override

+			public Adapter caseIdTreeItemAxis(IdTreeItemAxis object) {

+				return createIdTreeItemAxisAdapter();

+			}

+			@Override

+			public Adapter caseEObjectAxis(EObjectAxis object) {

+				return createEObjectAxisAdapter();

+			}

+			@Override

+			public Adapter caseEObjectTreeItemAxis(EObjectTreeItemAxis object) {

+				return createEObjectTreeItemAxisAdapter();

+			}

+			@Override

+			public Adapter caseFeatureAxis(FeatureAxis object) {

+				return createFeatureAxisAdapter();

+			}

+			@Override

+			public Adapter caseOperationAxis(OperationAxis object) {

+				return createOperationAxisAdapter();

+			}

+			@Override

+			public Adapter caseFeatureTreeItemAxis(FeatureTreeItemAxis object) {

+				return createFeatureTreeItemAxisAdapter();

+			}

+			@Override

+			public Adapter caseOperationTreeItemAxis(OperationTreeItemAxis object) {

+				return createOperationTreeItemAxisAdapter();

+			}

+			@Override

+			public Adapter caseObjectAxis(ObjectAxis object) {

+				return createObjectAxisAdapter();

+			}

+			@Override

+			public Adapter caseObjectTreeItemAxis(ObjectTreeItemAxis object) {

+				return createObjectTreeItemAxisAdapter();

+			}

+			@Override

+			public Adapter caseFeatureIdAxis(FeatureIdAxis object) {

+				return createFeatureIdAxisAdapter();

+			}

+			@Override

+			public Adapter caseFeatureIdTreeItemAxis(FeatureIdTreeItemAxis object) {

+				return createFeatureIdTreeItemAxisAdapter();

+			}

+			@Override

+			public Adapter caseEStructuralFeatureAxis(EStructuralFeatureAxis object) {

+				return createEStructuralFeatureAxisAdapter();

+			}

+			@Override

+			public Adapter caseEOperationAxis(EOperationAxis object) {

+				return createEOperationAxisAdapter();

+			}

+			@Override

+			public Adapter caseEStructuralFeatureTreeItemAxis(EStructuralFeatureTreeItemAxis object) {

+				return createEStructuralFeatureTreeItemAxisAdapter();

+			}

+			@Override

+			public Adapter caseEOperationTreeItemAxis(EOperationTreeItemAxis object) {

+				return createEOperationTreeItemAxisAdapter();

+			}

+			@Override

+			public Adapter caseObjectIdAxis(ObjectIdAxis object) {

+				return createObjectIdAxisAdapter();

+			}

+			@Override

+			public Adapter caseObjectIdTreeItemAxis(ObjectIdTreeItemAxis object) {

+				return createObjectIdTreeItemAxisAdapter();

+			}

+			@Override

+			public Adapter caseAxisGroup(AxisGroup object) {

+				return createAxisGroupAdapter();

+			}

+			@Override

+			public Adapter caseEModelElement(EModelElement object) {

+				return createEModelElementAdapter();

+			}

+			@Override

+			public Adapter caseStyledElement(StyledElement object) {

+				return createStyledElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *        the object to adapt.

+	 * @param target the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -221,7 +211,6 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	 * 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.nattableaxis.IAxis

 	 * @generated

@@ -231,13 +220,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis

-	 * <em>ITree Item Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis <em>ITree Item 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.nattableaxis.ITreeItemAxis

 	 * @generated

@@ -252,7 +239,6 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	 * 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.nattableaxis.IdAxis

 	 * @generated

@@ -262,13 +248,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis

-	 * <em>Id Tree Item Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis <em>Id Tree Item 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.nattableaxis.IdTreeItemAxis

 	 * @generated

@@ -278,13 +262,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis

-	 * <em>EObject Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.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.nattableaxis.EObjectAxis

 	 * @generated

@@ -294,13 +276,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis

-	 * <em>EObject Tree Item Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis <em>EObject Tree Item 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.nattableaxis.EObjectTreeItemAxis

 	 * @generated

@@ -310,13 +290,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis

-	 * <em>Feature Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis <em>Feature 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.nattableaxis.FeatureAxis

 	 * @generated

@@ -326,13 +304,25 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis

-	 * <em>Feature Tree Item Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationAxis <em>Operation 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.nattableaxis.OperationAxis

+	 * @generated

+	 */

+	public Adapter createOperationAxisAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis <em>Feature Tree Item 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.nattableaxis.FeatureTreeItemAxis

 	 * @generated

@@ -342,13 +332,25 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis

-	 * <em>Object Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationTreeItemAxis <em>Operation Tree Item 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.nattableaxis.OperationTreeItemAxis

+	 * @generated

+	 */

+	public Adapter createOperationTreeItemAxisAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis <em>Object 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.nattableaxis.ObjectAxis

 	 * @generated

@@ -358,13 +360,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis

-	 * <em>Object Tree Item Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis <em>Object Tree Item 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.nattableaxis.ObjectTreeItemAxis

 	 * @generated

@@ -374,13 +374,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis

-	 * <em>Feature Id Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis <em>Feature 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.nattableaxis.FeatureIdAxis

 	 * @generated

@@ -390,13 +388,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis

-	 * <em>Feature Id Tree Item Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis <em>Feature Id Tree Item 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.nattableaxis.FeatureIdTreeItemAxis

 	 * @generated

@@ -406,13 +402,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis

-	 * <em>EStructural Feature Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis <em>EStructural Feature 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.nattableaxis.EStructuralFeatureAxis

 	 * @generated

@@ -422,14 +416,25 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis

-	 * <em>EStructural Feature Tree Item Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationAxis <em>EOperation 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.nattableaxis.EOperationAxis

+	 * @generated

+	 */

+	public Adapter createEOperationAxisAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis <em>EStructural Feature Tree Item 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.nattableaxis.EStructuralFeatureTreeItemAxis

 	 * @generated

@@ -439,13 +444,25 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis

-	 * <em>Object Id Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EOperationTreeItemAxis <em>EOperation Tree Item 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.nattableaxis.EOperationTreeItemAxis

+	 * @generated

+	 */

+	public Adapter createEOperationTreeItemAxisAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis <em>Object 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.nattableaxis.ObjectIdAxis

 	 * @generated

@@ -455,13 +472,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis

-	 * <em>Object Id Tree Item Axis</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis <em>Object Id Tree Item 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.nattableaxis.ObjectIdTreeItemAxis

 	 * @generated

@@ -471,13 +486,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup

-	 * <em>Axis Group</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup <em>Axis Group</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.nattableaxis.AxisGroup

 	 * @generated

@@ -492,7 +505,6 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.ecore.EModelElement

 	 * @generated

@@ -502,13 +514,11 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * <em>Styled Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

 	 * @generated

@@ -522,7 +532,6 @@ public class NattableaxisAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
index 3857c0d9549..2edc98ad59b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.util.Switch;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

@@ -45,7 +46,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage

  * @generated

  */

@@ -55,7 +55,6 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattableaxisPackage modelPackage;

@@ -64,11 +63,10 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableaxisSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattableaxisPackage.eINSTANCE;

 		}

 	}

@@ -77,8 +75,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

+	 * @param ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

 	 */

@@ -91,396 +88,233 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case NattableaxisPackage.IAXIS:

-		{

-			IAxis iAxis = (IAxis)theEObject;

-			T result = caseIAxis(iAxis);

-			if(result == null) {

-				result = caseStyledElement(iAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(iAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.ITREE_ITEM_AXIS:

-		{

-			ITreeItemAxis iTreeItemAxis = (ITreeItemAxis)theEObject;

-			T result = caseITreeItemAxis(iTreeItemAxis);

-			if(result == null) {

-				result = caseIAxis(iTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(iTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(iTreeItemAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.ID_AXIS:

-		{

-			IdAxis idAxis = (IdAxis)theEObject;

-			T result = caseIdAxis(idAxis);

-			if(result == null) {

-				result = caseIAxis(idAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(idAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(idAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.ID_TREE_ITEM_AXIS:

-		{

-			IdTreeItemAxis idTreeItemAxis = (IdTreeItemAxis)theEObject;

-			T result = caseIdTreeItemAxis(idTreeItemAxis);

-			if(result == null) {

-				result = caseIdAxis(idTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseITreeItemAxis(idTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseIAxis(idTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(idTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(idTreeItemAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.EOBJECT_AXIS:

-		{

-			EObjectAxis eObjectAxis = (EObjectAxis)theEObject;

-			T result = caseEObjectAxis(eObjectAxis);

-			if(result == null) {

-				result = caseObjectAxis(eObjectAxis);

-			}

-			if(result == null) {

-				result = caseIAxis(eObjectAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(eObjectAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(eObjectAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS:

-		{

-			EObjectTreeItemAxis eObjectTreeItemAxis = (EObjectTreeItemAxis)theEObject;

-			T result = caseEObjectTreeItemAxis(eObjectTreeItemAxis);

-			if(result == null) {

-				result = caseEObjectAxis(eObjectTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseITreeItemAxis(eObjectTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseObjectAxis(eObjectTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseIAxis(eObjectTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(eObjectTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(eObjectTreeItemAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.FEATURE_AXIS:

-		{

-			FeatureAxis featureAxis = (FeatureAxis)theEObject;

-			T result = caseFeatureAxis(featureAxis);

-			if(result == null) {

-				result = caseIAxis(featureAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(featureAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(featureAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS:

-		{

-			FeatureTreeItemAxis featureTreeItemAxis = (FeatureTreeItemAxis)theEObject;

-			T result = caseFeatureTreeItemAxis(featureTreeItemAxis);

-			if(result == null) {

-				result = caseFeatureAxis(featureTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseITreeItemAxis(featureTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseIAxis(featureTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(featureTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(featureTreeItemAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.OBJECT_AXIS:

-		{

-			ObjectAxis objectAxis = (ObjectAxis)theEObject;

-			T result = caseObjectAxis(objectAxis);

-			if(result == null) {

-				result = caseIAxis(objectAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(objectAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(objectAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS:

-		{

-			ObjectTreeItemAxis objectTreeItemAxis = (ObjectTreeItemAxis)theEObject;

-			T result = caseObjectTreeItemAxis(objectTreeItemAxis);

-			if(result == null) {

-				result = caseObjectAxis(objectTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseITreeItemAxis(objectTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseIAxis(objectTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(objectTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(objectTreeItemAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.FEATURE_ID_AXIS:

-		{

-			FeatureIdAxis featureIdAxis = (FeatureIdAxis)theEObject;

-			T result = caseFeatureIdAxis(featureIdAxis);

-			if(result == null) {

-				result = caseIdAxis(featureIdAxis);

-			}

-			if(result == null) {

-				result = caseFeatureAxis(featureIdAxis);

-			}

-			if(result == null) {

-				result = caseIAxis(featureIdAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(featureIdAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(featureIdAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS:

-		{

-			FeatureIdTreeItemAxis featureIdTreeItemAxis = (FeatureIdTreeItemAxis)theEObject;

-			T result = caseFeatureIdTreeItemAxis(featureIdTreeItemAxis);

-			if(result == null) {

-				result = caseFeatureIdAxis(featureIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseITreeItemAxis(featureIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseIdAxis(featureIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseFeatureAxis(featureIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseIAxis(featureIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(featureIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(featureIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS:

-		{

-			EStructuralFeatureAxis eStructuralFeatureAxis = (EStructuralFeatureAxis)theEObject;

-			T result = caseEStructuralFeatureAxis(eStructuralFeatureAxis);

-			if(result == null) {

-				result = caseFeatureAxis(eStructuralFeatureAxis);

-			}

-			if(result == null) {

-				result = caseIAxis(eStructuralFeatureAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(eStructuralFeatureAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(eStructuralFeatureAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS:

-		{

-			EStructuralFeatureTreeItemAxis eStructuralFeatureTreeItemAxis = (EStructuralFeatureTreeItemAxis)theEObject;

-			T result = caseEStructuralFeatureTreeItemAxis(eStructuralFeatureTreeItemAxis);

-			if(result == null) {

-				result = caseEStructuralFeatureAxis(eStructuralFeatureTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseITreeItemAxis(eStructuralFeatureTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseFeatureAxis(eStructuralFeatureTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseIAxis(eStructuralFeatureTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(eStructuralFeatureTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(eStructuralFeatureTreeItemAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.OBJECT_ID_AXIS:

-		{

-			ObjectIdAxis objectIdAxis = (ObjectIdAxis)theEObject;

-			T result = caseObjectIdAxis(objectIdAxis);

-			if(result == null) {

-				result = caseIdAxis(objectIdAxis);

-			}

-			if(result == null) {

-				result = caseObjectAxis(objectIdAxis);

-			}

-			if(result == null) {

-				result = caseIAxis(objectIdAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(objectIdAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(objectIdAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS:

-		{

-			ObjectIdTreeItemAxis objectIdTreeItemAxis = (ObjectIdTreeItemAxis)theEObject;

-			T result = caseObjectIdTreeItemAxis(objectIdTreeItemAxis);

-			if(result == null) {

-				result = caseObjectIdAxis(objectIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseITreeItemAxis(objectIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseIdAxis(objectIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseObjectAxis(objectIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseIAxis(objectIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseStyledElement(objectIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = caseEModelElement(objectIdTreeItemAxis);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisPackage.AXIS_GROUP:

-		{

-			AxisGroup axisGroup = (AxisGroup)theEObject;

-			T result = caseAxisGroup(axisGroup);

-			if(result == null) {

-				result = caseIAxis(axisGroup);

-			}

-			if(result == null) {

-				result = caseStyledElement(axisGroup);

-			}

-			if(result == null) {

-				result = caseEModelElement(axisGroup);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+		switch (classifierID) {

+			case NattableaxisPackage.IAXIS: {

+				IAxis iAxis = (IAxis)theEObject;

+				T result = caseIAxis(iAxis);

+				if (result == null) result = caseStyledElement(iAxis);

+				if (result == null) result = caseEModelElement(iAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.ITREE_ITEM_AXIS: {

+				ITreeItemAxis iTreeItemAxis = (ITreeItemAxis)theEObject;

+				T result = caseITreeItemAxis(iTreeItemAxis);

+				if (result == null) result = caseIAxis(iTreeItemAxis);

+				if (result == null) result = caseStyledElement(iTreeItemAxis);

+				if (result == null) result = caseEModelElement(iTreeItemAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.ID_AXIS: {

+				IdAxis idAxis = (IdAxis)theEObject;

+				T result = caseIdAxis(idAxis);

+				if (result == null) result = caseIAxis(idAxis);

+				if (result == null) result = caseStyledElement(idAxis);

+				if (result == null) result = caseEModelElement(idAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.ID_TREE_ITEM_AXIS: {

+				IdTreeItemAxis idTreeItemAxis = (IdTreeItemAxis)theEObject;

+				T result = caseIdTreeItemAxis(idTreeItemAxis);

+				if (result == null) result = caseIdAxis(idTreeItemAxis);

+				if (result == null) result = caseITreeItemAxis(idTreeItemAxis);

+				if (result == null) result = caseIAxis(idTreeItemAxis);

+				if (result == null) result = caseStyledElement(idTreeItemAxis);

+				if (result == null) result = caseEModelElement(idTreeItemAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.EOBJECT_AXIS: {

+				EObjectAxis eObjectAxis = (EObjectAxis)theEObject;

+				T result = caseEObjectAxis(eObjectAxis);

+				if (result == null) result = caseObjectAxis(eObjectAxis);

+				if (result == null) result = caseIAxis(eObjectAxis);

+				if (result == null) result = caseStyledElement(eObjectAxis);

+				if (result == null) result = caseEModelElement(eObjectAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS: {

+				EObjectTreeItemAxis eObjectTreeItemAxis = (EObjectTreeItemAxis)theEObject;

+				T result = caseEObjectTreeItemAxis(eObjectTreeItemAxis);

+				if (result == null) result = caseEObjectAxis(eObjectTreeItemAxis);

+				if (result == null) result = caseITreeItemAxis(eObjectTreeItemAxis);

+				if (result == null) result = caseObjectAxis(eObjectTreeItemAxis);

+				if (result == null) result = caseIAxis(eObjectTreeItemAxis);

+				if (result == null) result = caseStyledElement(eObjectTreeItemAxis);

+				if (result == null) result = caseEModelElement(eObjectTreeItemAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.FEATURE_AXIS: {

+				FeatureAxis featureAxis = (FeatureAxis)theEObject;

+				T result = caseFeatureAxis(featureAxis);

+				if (result == null) result = caseIAxis(featureAxis);

+				if (result == null) result = caseStyledElement(featureAxis);

+				if (result == null) result = caseEModelElement(featureAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.OPERATION_AXIS: {

+				OperationAxis operationAxis = (OperationAxis)theEObject;

+				T result = caseOperationAxis(operationAxis);

+				if (result == null) result = caseIAxis(operationAxis);

+				if (result == null) result = caseStyledElement(operationAxis);

+				if (result == null) result = caseEModelElement(operationAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS: {

+				FeatureTreeItemAxis featureTreeItemAxis = (FeatureTreeItemAxis)theEObject;

+				T result = caseFeatureTreeItemAxis(featureTreeItemAxis);

+				if (result == null) result = caseFeatureAxis(featureTreeItemAxis);

+				if (result == null) result = caseITreeItemAxis(featureTreeItemAxis);

+				if (result == null) result = caseIAxis(featureTreeItemAxis);

+				if (result == null) result = caseStyledElement(featureTreeItemAxis);

+				if (result == null) result = caseEModelElement(featureTreeItemAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS: {

+				OperationTreeItemAxis operationTreeItemAxis = (OperationTreeItemAxis)theEObject;

+				T result = caseOperationTreeItemAxis(operationTreeItemAxis);

+				if (result == null) result = caseOperationAxis(operationTreeItemAxis);

+				if (result == null) result = caseITreeItemAxis(operationTreeItemAxis);

+				if (result == null) result = caseIAxis(operationTreeItemAxis);

+				if (result == null) result = caseStyledElement(operationTreeItemAxis);

+				if (result == null) result = caseEModelElement(operationTreeItemAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.OBJECT_AXIS: {

+				ObjectAxis objectAxis = (ObjectAxis)theEObject;

+				T result = caseObjectAxis(objectAxis);

+				if (result == null) result = caseIAxis(objectAxis);

+				if (result == null) result = caseStyledElement(objectAxis);

+				if (result == null) result = caseEModelElement(objectAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS: {

+				ObjectTreeItemAxis objectTreeItemAxis = (ObjectTreeItemAxis)theEObject;

+				T result = caseObjectTreeItemAxis(objectTreeItemAxis);

+				if (result == null) result = caseObjectAxis(objectTreeItemAxis);

+				if (result == null) result = caseITreeItemAxis(objectTreeItemAxis);

+				if (result == null) result = caseIAxis(objectTreeItemAxis);

+				if (result == null) result = caseStyledElement(objectTreeItemAxis);

+				if (result == null) result = caseEModelElement(objectTreeItemAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.FEATURE_ID_AXIS: {

+				FeatureIdAxis featureIdAxis = (FeatureIdAxis)theEObject;

+				T result = caseFeatureIdAxis(featureIdAxis);

+				if (result == null) result = caseIdAxis(featureIdAxis);

+				if (result == null) result = caseFeatureAxis(featureIdAxis);

+				if (result == null) result = caseIAxis(featureIdAxis);

+				if (result == null) result = caseStyledElement(featureIdAxis);

+				if (result == null) result = caseEModelElement(featureIdAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS: {

+				FeatureIdTreeItemAxis featureIdTreeItemAxis = (FeatureIdTreeItemAxis)theEObject;

+				T result = caseFeatureIdTreeItemAxis(featureIdTreeItemAxis);

+				if (result == null) result = caseFeatureIdAxis(featureIdTreeItemAxis);

+				if (result == null) result = caseITreeItemAxis(featureIdTreeItemAxis);

+				if (result == null) result = caseIdAxis(featureIdTreeItemAxis);

+				if (result == null) result = caseFeatureAxis(featureIdTreeItemAxis);

+				if (result == null) result = caseIAxis(featureIdTreeItemAxis);

+				if (result == null) result = caseStyledElement(featureIdTreeItemAxis);

+				if (result == null) result = caseEModelElement(featureIdTreeItemAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS: {

+				EStructuralFeatureAxis eStructuralFeatureAxis = (EStructuralFeatureAxis)theEObject;

+				T result = caseEStructuralFeatureAxis(eStructuralFeatureAxis);

+				if (result == null) result = caseFeatureAxis(eStructuralFeatureAxis);

+				if (result == null) result = caseIAxis(eStructuralFeatureAxis);

+				if (result == null) result = caseStyledElement(eStructuralFeatureAxis);

+				if (result == null) result = caseEModelElement(eStructuralFeatureAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.EOPERATION_AXIS: {

+				EOperationAxis eOperationAxis = (EOperationAxis)theEObject;

+				T result = caseEOperationAxis(eOperationAxis);

+				if (result == null) result = caseOperationAxis(eOperationAxis);

+				if (result == null) result = caseIAxis(eOperationAxis);

+				if (result == null) result = caseStyledElement(eOperationAxis);

+				if (result == null) result = caseEModelElement(eOperationAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.ESTRUCTURAL_FEATURE_TREE_ITEM_AXIS: {

+				EStructuralFeatureTreeItemAxis eStructuralFeatureTreeItemAxis = (EStructuralFeatureTreeItemAxis)theEObject;

+				T result = caseEStructuralFeatureTreeItemAxis(eStructuralFeatureTreeItemAxis);

+				if (result == null) result = caseEStructuralFeatureAxis(eStructuralFeatureTreeItemAxis);

+				if (result == null) result = caseITreeItemAxis(eStructuralFeatureTreeItemAxis);

+				if (result == null) result = caseFeatureAxis(eStructuralFeatureTreeItemAxis);

+				if (result == null) result = caseIAxis(eStructuralFeatureTreeItemAxis);

+				if (result == null) result = caseStyledElement(eStructuralFeatureTreeItemAxis);

+				if (result == null) result = caseEModelElement(eStructuralFeatureTreeItemAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.EOPERATION_TREE_ITEM_AXIS: {

+				EOperationTreeItemAxis eOperationTreeItemAxis = (EOperationTreeItemAxis)theEObject;

+				T result = caseEOperationTreeItemAxis(eOperationTreeItemAxis);

+				if (result == null) result = caseEOperationAxis(eOperationTreeItemAxis);

+				if (result == null) result = caseITreeItemAxis(eOperationTreeItemAxis);

+				if (result == null) result = caseOperationAxis(eOperationTreeItemAxis);

+				if (result == null) result = caseIAxis(eOperationTreeItemAxis);

+				if (result == null) result = caseStyledElement(eOperationTreeItemAxis);

+				if (result == null) result = caseEModelElement(eOperationTreeItemAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.OBJECT_ID_AXIS: {

+				ObjectIdAxis objectIdAxis = (ObjectIdAxis)theEObject;

+				T result = caseObjectIdAxis(objectIdAxis);

+				if (result == null) result = caseIdAxis(objectIdAxis);

+				if (result == null) result = caseObjectAxis(objectIdAxis);

+				if (result == null) result = caseIAxis(objectIdAxis);

+				if (result == null) result = caseStyledElement(objectIdAxis);

+				if (result == null) result = caseEModelElement(objectIdAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.OBJECT_ID_TREE_ITEM_AXIS: {

+				ObjectIdTreeItemAxis objectIdTreeItemAxis = (ObjectIdTreeItemAxis)theEObject;

+				T result = caseObjectIdTreeItemAxis(objectIdTreeItemAxis);

+				if (result == null) result = caseObjectIdAxis(objectIdTreeItemAxis);

+				if (result == null) result = caseITreeItemAxis(objectIdTreeItemAxis);

+				if (result == null) result = caseIdAxis(objectIdTreeItemAxis);

+				if (result == null) result = caseObjectAxis(objectIdTreeItemAxis);

+				if (result == null) result = caseIAxis(objectIdTreeItemAxis);

+				if (result == null) result = caseStyledElement(objectIdTreeItemAxis);

+				if (result == null) result = caseEModelElement(objectIdTreeItemAxis);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisPackage.AXIS_GROUP: {

+				AxisGroup axisGroup = (AxisGroup)theEObject;

+				T result = caseAxisGroup(axisGroup);

+				if (result == null) result = caseIAxis(axisGroup);

+				if (result == null) result = caseStyledElement(axisGroup);

+				if (result == null) result = caseEModelElement(axisGroup);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -490,9 +324,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>IAxis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -507,9 +339,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>ITree Item Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -524,9 +354,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Id Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -541,9 +369,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Id Tree Item Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -558,9 +384,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -575,9 +399,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject Tree Item Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -592,9 +414,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -604,14 +424,27 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	}

 

 	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Operation 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>Operation Axis</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseOperationAxis(OperationAxis object) {

+		return null;

+	}

+

+	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Feature Tree Item 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.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Tree Item Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -621,14 +454,27 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	}

 

 	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Operation Tree Item 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>Operation Tree Item Axis</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseOperationTreeItemAxis(OperationTreeItemAxis object) {

+		return null;

+	}

+

+	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Object 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.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Object Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -643,9 +489,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Object Tree Item Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -660,9 +504,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Id Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -677,9 +519,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Id Tree Item Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -694,9 +534,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EStructural Feature Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -706,14 +544,27 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	}

 

 	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EOperation 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>EOperation Axis</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseEOperationAxis(EOperationAxis object) {

+		return null;

+	}

+

+	/**

 	 * Returns the result of interpreting the object as an instance of '<em>EStructural Feature Tree Item 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.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EStructural Feature Tree Item Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -723,14 +574,27 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	}

 

 	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EOperation Tree Item 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>EOperation Tree Item Axis</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseEOperationTreeItemAxis(EOperationTreeItemAxis object) {

+		return null;

+	}

+

+	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Object 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.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Object Id Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -745,9 +609,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Object Id Tree Item Axis</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -762,9 +624,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Axis Group</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -779,9 +639,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -796,9 +654,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -813,9 +669,7 @@ public class NattableaxisSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
index 76bb87bbaa9..a3a30ffefd3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
@@ -22,37 +22,29 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * <!-- end-user-doc -->

  *

  * <!-- begin-model-doc -->

- * Abstract Class for the HeaderAxisConfiguration. This class provides :

- * <ul>

- * <li>informations on the appearance of the header</li>

- * <li>a list of label configuration which can be used by the header</li>

- * <li>a list of axisConfiguration. These axis configuration are used to provide the contents of the axis</li>

+ * Abstract Class for the HeaderAxisConfiguration. This class provides : 

+ * <ul><li>informations on the appearance of the header</li>

+ * <li> a list of label configuration which can be used by the header</li>

+ * <li> a list of axisConfiguration. These axis configuration are used to provide the contents of the axis</li>

  * </ul>

  * <!-- end-model-doc -->

  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index

- * Style</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display

- * Label</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display

- * Filter</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display

- * Index</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations

- * <em>Owned Label Configurations</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations

- * <em>Owned Axis Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations <em>Owned Label Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations <em>Owned Axis Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration()

  * @model abstract="true"

  *        annotation="http://www.eclipse.org/emf/2002/Ecore constraints='oneObjectLabelConfigurationTypes oneFeatureLabelConfigurationTypes'"

- *        annotation=

- *        "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot oneObjectLabelConfigurationTypes='ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::ObjectLabelProviderConfiguration))->size() <= 1' oneFeatureLabelConfigurationTypes='ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::FeatureLabelProviderConfiguration))->size() <= 1'"

+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot oneObjectLabelConfigurationTypes='ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::ObjectLabelProviderConfiguration))->size() <= 1' oneFeatureLabelConfigurationTypes='ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::FeatureLabelProviderConfiguration))->size() <= 1'"

  * @generated

  */

 public interface AbstractHeaderAxisConfiguration extends StyledElement {

@@ -65,7 +57,6 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * This value can't be null. Indicates how to display the index of the Axis : using letter or using number.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Index Style</em>' attribute.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

 	 * @see #setIndexStyle(AxisIndexStyle)

@@ -76,14 +67,10 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
 	AxisIndexStyle getIndexStyle();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle

-	 * <em>Index Style</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Index Style</em>' attribute.

+	 * @param value the new value of the '<em>Index Style</em>' attribute.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

 	 * @see #getIndexStyle()

 	 * @generated

@@ -98,7 +85,6 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * If true, the label header will be displayed.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Display Label</em>' attribute.

 	 * @see #setDisplayLabel(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayLabel()

@@ -108,14 +94,10 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
 	boolean isDisplayLabel();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel

-	 * <em>Display Label</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Display Label</em>' attribute.

+	 * @param value the new value of the '<em>Display Label</em>' attribute.

 	 * @see #isDisplayLabel()

 	 * @generated

 	 */

@@ -129,7 +111,6 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * If true AND if the axisConfiguration is used as column, the row filter will be displayed.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Display Filter</em>' attribute.

 	 * @see #setDisplayFilter(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayFilter()

@@ -139,14 +120,10 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
 	boolean isDisplayFilter();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter

-	 * <em>Display Filter</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Display Filter</em>' attribute.

+	 * @param value the new value of the '<em>Display Filter</em>' attribute.

 	 * @see #isDisplayFilter()

 	 * @generated

 	 */

@@ -160,7 +137,6 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * If true, the index header will be displayed.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Display Index</em>' attribute.

 	 * @see #setDisplayIndex(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayIndex()

@@ -170,14 +146,10 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
 	boolean isDisplayIndex();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex

-	 * <em>Display Index</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Display Index</em>' attribute.

+	 * @param value the new value of the '<em>Display Index</em>' attribute.

 	 * @see #isDisplayIndex()

 	 * @generated

 	 */

@@ -191,7 +163,6 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * The list of the possible label configuration, referenced by the axis configuration.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Owned Label Configurations</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations()

 	 * @model containment="true"

@@ -207,7 +178,6 @@ public interface AbstractHeaderAxisConfiguration extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * The list of the owned axis configuration.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Owned Axis Configurations</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations()

 	 * @model containment="true"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
index 53bb643cb33..294e9668ff4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
@@ -26,7 +26,6 @@ import org.eclipse.emf.common.util.Enumerator;
  * <!-- begin-model-doc -->

  * Enumeration used to describe the possible style of the index of the headers.

  * <!-- end-model-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisIndexStyle()

  * @model

  * @generated

@@ -36,7 +35,6 @@ public enum AxisIndexStyle implements Enumerator {
 	 * The '<em><b>ALPHABETIC</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #ALPHABETIC_VALUE

 	 * @generated

 	 * @ordered

@@ -46,7 +44,6 @@ public enum AxisIndexStyle implements Enumerator {
 	 * The '<em><b>NUMERIC</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #NUMERIC_VALUE

 	 * @generated

 	 * @ordered

@@ -60,7 +57,6 @@ public enum AxisIndexStyle implements Enumerator {
 	 * <!-- begin-model-doc -->

 	 * Index Headers count will be : A-B-C-...Y-Z-AA-AB-...

 	 * <!-- end-model-doc -->

-	 *

 	 * @see #ALPHABETIC

 	 * @model

 	 * @generated

@@ -75,7 +71,6 @@ public enum AxisIndexStyle implements Enumerator {
 	 * <!-- begin-model-doc -->

 	 * Index Headers count will be : 1-2-3-...

 	 * <!-- end-model-doc -->

-	 *

 	 * @see #NUMERIC

 	 * @model

 	 * @generated

@@ -87,16 +82,17 @@ public enum AxisIndexStyle implements Enumerator {
 	 * An array of all the '<em><b>Axis Index Style</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	private static final AxisIndexStyle[] VALUES_ARRAY = new AxisIndexStyle[]{ ALPHABETIC, NUMERIC, };

+	private static final AxisIndexStyle[] VALUES_ARRAY = new AxisIndexStyle[] {

+			ALPHABETIC,

+			NUMERIC,

+		};

 

 	/**

 	 * A public read-only list of all the '<em><b>Axis Index Style</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static final List<AxisIndexStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -105,13 +101,14 @@ public enum AxisIndexStyle implements Enumerator {
 	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param literal the literal.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static AxisIndexStyle get(String literal) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			AxisIndexStyle result = VALUES_ARRAY[i];

-			if(result.toString().equals(literal)) {

+			if (result.toString().equals(literal)) {

 				return result;

 			}

 		}

@@ -122,13 +119,14 @@ public enum AxisIndexStyle implements Enumerator {
 	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param name the name.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static AxisIndexStyle getByName(String name) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			AxisIndexStyle result = VALUES_ARRAY[i];

-			if(result.getName().equals(name)) {

+			if (result.getName().equals(name)) {

 				return result;

 			}

 		}

@@ -139,15 +137,14 @@ public enum AxisIndexStyle implements Enumerator {
 	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param value the integer value.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static AxisIndexStyle get(int value) {

-		switch(value) {

-		case ALPHABETIC_VALUE:

-			return ALPHABETIC;

-		case NUMERIC_VALUE:

-			return NUMERIC;

+		switch (value) {

+			case ALPHABETIC_VALUE: return ALPHABETIC;

+			case NUMERIC_VALUE: return NUMERIC;

 		}

 		return null;

 	}

@@ -155,7 +152,6 @@ public enum AxisIndexStyle implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final int value;

@@ -163,7 +159,6 @@ public enum AxisIndexStyle implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final String name;

@@ -171,7 +166,6 @@ public enum AxisIndexStyle implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final String literal;

@@ -180,7 +174,6 @@ public enum AxisIndexStyle implements Enumerator {
 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private AxisIndexStyle(int value, String name, String literal) {

@@ -192,41 +185,37 @@ public enum AxisIndexStyle implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int getValue() {

-		return value;

+	  return value;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getName() {

-		return name;

+	  return name;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getLiteral() {

-		return literal;

+	  return literal;

 	}

 

 	/**

 	 * Returns the literal value of the enumerator, which is its string representation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
index 49b42e5b938..4b6a37056f9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
@@ -27,15 +27,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <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#getLocalSpecificConfigurations <em>

- * Local Specific Configurations</em>}</li>

+ *   <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#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration()

  * @model

@@ -50,7 +47,6 @@ public interface AxisManagerConfiguration extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * Reference the local header label configuration.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Local Header Label Configuration</em>' reference.

 	 * @see #setLocalHeaderLabelConfiguration(ILabelProviderConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_LocalHeaderLabelConfiguration()

@@ -60,14 +56,10 @@ public interface AxisManagerConfiguration extends StyledElement {
 	ILabelProviderConfiguration getLocalHeaderLabelConfiguration();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration

-	 * <em>Local Header Label Configuration</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Local Header Label Configuration</em>' reference.

+	 * @param value the new value of the '<em>Local Header Label Configuration</em>' reference.

 	 * @see #getLocalHeaderLabelConfiguration()

 	 * @generated

 	 */

@@ -80,7 +72,6 @@ public interface AxisManagerConfiguration extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * This value can't be null. the axis manager representation

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Axis Manager</em>' reference.

 	 * @see #setAxisManager(AxisManagerRepresentation)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_AxisManager()

@@ -90,14 +81,10 @@ public interface AxisManagerConfiguration extends StyledElement {
 	AxisManagerRepresentation getAxisManager();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager

-	 * <em>Axis Manager</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Axis Manager</em>' reference.

+	 * @param value the new value of the '<em>Axis Manager</em>' reference.

 	 * @see #getAxisManager()

 	 * @generated

 	 */

@@ -111,7 +98,6 @@ public interface AxisManagerConfiguration extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * specific configurations for the axis manager.

 	 * <!-- end-model-doc -->

-	 *

 	 * @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

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
index 3993200e805..9330b5f288f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
@@ -27,22 +27,17 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <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#getSpecificAxisConfigurations <em>

- * Specific Axis Configurations</em>}</li>

+ *   <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#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation()

  * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='nonEmptyAxisManager'"

- *        annotation=

- *        "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot nonEmptyAxisManager='not (axisManagerId.oclIsUndefined() or axisManagerId = \'\')'"

+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot nonEmptyAxisManager='not (axisManagerId.oclIsUndefined() or axisManagerId = \'\')'"

  * @generated

  */

 public interface AxisManagerRepresentation extends StyledElement {

@@ -54,9 +49,8 @@ public interface AxisManagerRepresentation extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * This id allows to find the Java Axis Manager represented by this element.

 	 * To find it you must use AxisManagerFactory.INSTANCE.getAxisManager(AxisManagerRepresentation)

-	 * To register a Java Axis Manager,you must use the extension point : org.eclipse.papyrus.infra.nattable.axismanager

+	 * To register a Java Axis Manager,you must use the extension point  : org.eclipse.papyrus.infra.nattable.axismanager

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Axis Manager Id</em>' attribute.

 	 * @see #setAxisManagerId(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_AxisManagerId()

@@ -66,14 +60,10 @@ public interface AxisManagerRepresentation extends StyledElement {
 	String getAxisManagerId();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId

-	 * <em>Axis Manager Id</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Axis Manager Id</em>' attribute.

+	 * @param value the new value of the '<em>Axis Manager Id</em>' attribute.

 	 * @see #getAxisManagerId()

 	 * @generated

 	 */

@@ -87,7 +77,6 @@ public interface AxisManagerRepresentation extends StyledElement {
 	 * The context on which the label provider to use for this AxisManagerRepresentation are declared.

 	 * (see the Papyrus Label Provider Service for further informations)

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Label Provider Context</em>' attribute.

 	 * @see #setLabelProviderContext(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_LabelProviderContext()

@@ -97,14 +86,10 @@ public interface AxisManagerRepresentation extends StyledElement {
 	String getLabelProviderContext();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext

-	 * <em>Label Provider Context</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Label Provider Context</em>' attribute.

+	 * @param value the new value of the '<em>Label Provider Context</em>' attribute.

 	 * @see #getLabelProviderContext()

 	 * @generated

 	 */

@@ -117,7 +102,6 @@ public interface AxisManagerRepresentation extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * The label provider configuration to use for the header of the axis provided by the represented AxisManager

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Header Label Configuration</em>' reference.

 	 * @see #setHeaderLabelConfiguration(ILabelProviderConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_HeaderLabelConfiguration()

@@ -127,14 +111,10 @@ public interface AxisManagerRepresentation extends StyledElement {
 	ILabelProviderConfiguration getHeaderLabelConfiguration();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration

-	 * <em>Header Label Configuration</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Header Label Configuration</em>' reference.

+	 * @param value the new value of the '<em>Header Label Configuration</em>' reference.

 	 * @see #getHeaderLabelConfiguration()

 	 * @generated

 	 */

@@ -148,7 +128,6 @@ public interface AxisManagerRepresentation extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * A list of specific configurations to use for this axis.

 	 * <!-- end-model-doc -->

-	 *

 	 * @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

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
index 8345cf0bcce..7533c0fc2a8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
@@ -25,12 +25,10 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>

- * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature

- * <em>Listen Feature</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getEStructuralFeatureValueFillingConfiguration()

  * @model

@@ -46,7 +44,6 @@ public interface EStructuralFeatureValueFillingConfiguration extends IFillingCon
 	 * This field can't be null. References the feature of the context of the table to listen.

 	 * It is possible that the context doesn't have this feature.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Listen Feature</em>' reference.

 	 * @see #setListenFeature(EStructuralFeature)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getEStructuralFeatureValueFillingConfiguration_ListenFeature()

@@ -56,14 +53,10 @@ public interface EStructuralFeatureValueFillingConfiguration extends IFillingCon
 	EStructuralFeature getListenFeature();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature

-	 * <em>Listen Feature</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Listen Feature</em>' reference.

+	 * @param value the new value of the '<em>Listen Feature</em>' reference.

 	 * @see #getListenFeature()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
index d7d9fd0408d..e9031b5ba48 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
@@ -23,11 +23,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurat
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show

- * Only Common Feature</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getFeatureAxisConfiguration()

  * @model

@@ -42,7 +41,6 @@ public interface FeatureAxisConfiguration extends IAxisConfiguration {
 	 * <!-- begin-model-doc -->

 	 * If true, only the common features will be displayed on the axis.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Show Only Common Feature</em>' attribute.

 	 * @see #setShowOnlyCommonFeature(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getFeatureAxisConfiguration_ShowOnlyCommonFeature()

@@ -52,14 +50,10 @@ public interface FeatureAxisConfiguration extends IAxisConfiguration {
 	boolean isShowOnlyCommonFeature();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature

-	 * <em>Show Only Common Feature</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Show Only Common Feature</em>' attribute.

+	 * @param value the new value of the '<em>Show Only Common Feature</em>' attribute.

 	 * @see #isShowOnlyCommonFeature()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
index 09c71a16106..f0e6b61571c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
@@ -25,11 +25,11 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#getPostActions <em>Post Actions</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#getPostActions <em>Post Actions</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration()

  * @model

@@ -43,9 +43,8 @@ public interface IPasteConfiguration extends IAxisConfiguration {
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * <!-- begin-model-doc -->

-	 * This field references post actions, using a string to do during the paste, after the creation of the element.

+	 * This field references post actions, using a string to do during the paste, after the creation of the element. 

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Post Actions</em>' attribute list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration_PostActions()

 	 * @model

@@ -62,7 +61,6 @@ public interface IPasteConfiguration extends IAxisConfiguration {
 	 * If true, the created elements will be added at the end of the paste and the set values

 	 * won't be do using the service edit

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Detached Mode</em>' attribute.

 	 * @see #setDetachedMode(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration_DetachedMode()

@@ -72,13 +70,10 @@ public interface IPasteConfiguration extends IAxisConfiguration {
 	boolean isDetachedMode();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode

-	 * <em>Detached Mode</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Detached Mode</em>' attribute.

+	 * @param value the new value of the '<em>Detached Mode</em>' attribute.

 	 * @see #isDetachedMode()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
index 8a50869161a..0369915fe3f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
@@ -25,12 +25,10 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>

- * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations

- * <em>Axis Manager Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getLocalTableHeaderAxisConfiguration()

  * @model

@@ -46,7 +44,6 @@ public interface LocalTableHeaderAxisConfiguration extends AbstractHeaderAxisCon
 	 * <!-- begin-model-doc -->

 	 * This list contains the configuration of the axis managers used in the table.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Axis Manager Configurations</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations()

 	 * @model containment="true"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
index 70164c8e424..541f6d32262 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

  * @generated

  */

@@ -29,7 +28,6 @@ public interface NattableaxisconfigurationFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattableaxisconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationFactoryImpl.init();

@@ -38,7 +36,6 @@ public interface NattableaxisconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Axis Manager Representation</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Axis Manager Representation</em>'.

 	 * @generated

 	 */

@@ -48,7 +45,6 @@ public interface NattableaxisconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Axis Manager Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Axis Manager Configuration</em>'.

 	 * @generated

 	 */

@@ -58,7 +54,6 @@ public interface NattableaxisconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Table Header Axis Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Table Header Axis Configuration</em>'.

 	 * @generated

 	 */

@@ -68,7 +63,6 @@ public interface NattableaxisconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Local Table Header Axis Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Local Table Header Axis Configuration</em>'.

 	 * @generated

 	 */

@@ -78,7 +72,6 @@ public interface NattableaxisconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Feature Axis Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Feature Axis Configuration</em>'.

 	 * @generated

 	 */

@@ -88,7 +81,6 @@ public interface NattableaxisconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>EStructural Feature Value Filling Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>EStructural Feature Value Filling Configuration</em>'.

 	 * @generated

 	 */

@@ -98,7 +90,6 @@ public interface NattableaxisconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>IPaste Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>IPaste Configuration</em>'.

 	 * @generated

 	 */

@@ -108,7 +99,6 @@ public interface NattableaxisconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Paste EObject Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Paste EObject Configuration</em>'.

 	 * @generated

 	 */

@@ -118,7 +108,6 @@ public interface NattableaxisconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Tree Filling Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Tree Filling Configuration</em>'.

 	 * @generated

 	 */

@@ -128,7 +117,6 @@ public interface NattableaxisconfigurationFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
index 48890e49484..f24a8287b12 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
@@ -31,11 +31,9 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory

  * @model kind="package"

- *        annotation=

- *        "http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"

+ *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"

  * @generated

  */

 public interface NattableaxisconfigurationPackage extends EPackage {

@@ -44,7 +42,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNAME = "nattableaxisconfiguration"; //$NON-NLS-1$

@@ -53,7 +50,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"; //$NON-NLS-1$

@@ -62,7 +58,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "nattableaxisconfiguration"; //$NON-NLS-1$

@@ -71,18 +66,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattableaxisconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl.init();

 

 	/**

-	 * The meta object id for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl

-	 * <em>Abstract Header Axis Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl <em>Abstract Header Axis Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAbstractHeaderAxisConfiguration()

 	 * @generated

@@ -93,7 +84,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -103,7 +93,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -113,7 +102,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Index Style</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -123,7 +111,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -133,7 +120,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Filter</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -143,7 +129,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Index</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -153,7 +138,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Label Configurations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -163,7 +147,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Axis Configurations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -173,7 +156,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Abstract Header Axis Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -183,7 +165,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -193,7 +174,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -203,7 +183,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -213,7 +192,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -223,19 +201,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>Abstract Header Axis Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int ABSTRACT_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl

-	 * <em>Axis Manager Representation</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl <em>Axis Manager Representation</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisManagerRepresentation()

 	 * @generated

@@ -246,7 +220,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -256,7 +229,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -266,7 +238,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Axis Manager Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -276,7 +247,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Label Provider Context</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -286,7 +256,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Header Label Configuration</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -296,7 +265,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Specific Axis Configurations</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -306,7 +274,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Axis Manager Representation</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -316,7 +283,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -326,7 +292,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -336,7 +301,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -346,7 +310,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -356,19 +319,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>Axis Manager Representation</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int AXIS_MANAGER_REPRESENTATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl

-	 * <em>Axis Manager Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl <em>Axis Manager Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisManagerConfiguration()

 	 * @generated

@@ -379,7 +338,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -389,7 +347,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -399,7 +356,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Header Label Configuration</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -409,7 +365,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Axis Manager</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -419,7 +374,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Specific Configurations</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -429,7 +383,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Axis Manager Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -439,7 +392,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -449,7 +401,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -459,7 +410,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -469,7 +419,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -479,19 +428,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>Axis Manager Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int AXIS_MANAGER_CONFIGURATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl

-	 * <em>Table Header Axis Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl <em>Table Header Axis Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getTableHeaderAxisConfiguration()

 	 * @generated

@@ -502,7 +447,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -512,7 +456,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -522,7 +465,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Index Style</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -532,7 +474,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -542,7 +483,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Filter</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -552,7 +492,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Index</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -562,7 +501,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Label Configurations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -572,7 +510,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Axis Configurations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -582,7 +519,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Axis Managers</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -592,7 +528,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Table Header Axis Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -602,7 +537,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -612,7 +546,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -622,7 +555,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -632,7 +564,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -642,19 +573,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>Table Header Axis Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int TABLE_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT = ABSTRACT_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl

-	 * <em>Local Table Header Axis Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl <em>Local Table Header Axis Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getLocalTableHeaderAxisConfiguration()

 	 * @generated

@@ -665,7 +592,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -675,7 +601,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -685,7 +610,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Index Style</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -695,7 +619,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -705,7 +628,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Filter</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -715,7 +637,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Index</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -725,7 +646,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Label Configurations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -735,7 +655,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Axis Configurations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -745,7 +664,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Axis Manager Configurations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -755,7 +673,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Local Table Header Axis Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -765,7 +682,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -775,7 +691,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -785,7 +700,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -795,7 +709,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -805,18 +718,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>Local Table Header Axis Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int LOCAL_TABLE_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT = ABSTRACT_HEADER_AXIS_CONFIGURATION_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration

-	 * <em>IAxis Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIAxisConfiguration()

 	 * @generated

@@ -827,7 +737,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -837,7 +746,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -847,7 +755,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>IAxis Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -857,7 +764,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -867,7 +773,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -877,7 +782,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -887,7 +791,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -897,19 +800,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>IAxis Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int IAXIS_CONFIGURATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl

-	 * <em>Feature Axis Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl <em>Feature Axis Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getFeatureAxisConfiguration()

 	 * @generated

@@ -920,7 +819,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -930,7 +828,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -940,7 +837,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Show Only Common Feature</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -950,7 +846,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature Axis Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -960,7 +855,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -970,7 +864,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -980,7 +873,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -990,7 +882,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1000,18 +891,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>Feature Axis Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int FEATURE_AXIS_CONFIGURATION_OPERATION_COUNT = IAXIS_CONFIGURATION_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration

-	 * <em>IFilling Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIFillingConfiguration()

 	 * @generated

@@ -1022,7 +910,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1032,7 +919,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1042,7 +928,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>IFilling Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1052,7 +937,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1062,7 +946,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1072,7 +955,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1082,7 +964,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1092,19 +973,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>IFilling Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int IFILLING_CONFIGURATION_OPERATION_COUNT = IAXIS_CONFIGURATION_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl

-	 * <em>EStructural Feature Value Filling Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl <em>EStructural Feature Value Filling Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getEStructuralFeatureValueFillingConfiguration()

 	 * @generated

@@ -1115,7 +992,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1125,7 +1001,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1135,7 +1010,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Listen Feature</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1145,7 +1019,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>EStructural Feature Value Filling Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1155,7 +1028,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1165,7 +1037,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1175,7 +1046,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1185,7 +1055,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1195,18 +1064,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>EStructural Feature Value Filling Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION_OPERATION_COUNT = IFILLING_CONFIGURATION_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl

-	 * <em>IPaste Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl <em>IPaste Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIPasteConfiguration()

 	 * @generated

@@ -1217,7 +1083,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1227,7 +1092,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1237,7 +1101,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Post Actions</b></em>' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1247,7 +1110,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Detached Mode</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1257,7 +1119,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>IPaste Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1267,7 +1128,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1277,7 +1137,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1287,7 +1146,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1297,7 +1155,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1307,19 +1164,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>IPaste Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int IPASTE_CONFIGURATION_OPERATION_COUNT = IAXIS_CONFIGURATION_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl

-	 * <em>Paste EObject Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl <em>Paste EObject Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getPasteEObjectConfiguration()

 	 * @generated

@@ -1330,7 +1183,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1340,7 +1192,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1350,7 +1201,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Post Actions</b></em>' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1360,7 +1210,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Detached Mode</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1370,7 +1219,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Pasted Element Id</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1380,7 +1228,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Paste Element Containement Feature</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1390,7 +1237,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Paste EObject Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1400,7 +1246,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1410,7 +1255,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1420,7 +1264,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1430,7 +1273,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1440,19 +1282,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>Paste EObject Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int PASTE_EOBJECT_CONFIGURATION_OPERATION_COUNT = IPASTE_CONFIGURATION_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl

-	 * <em>Tree Filling Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl <em>Tree Filling Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getTreeFillingConfiguration()

 	 * @generated

@@ -1463,7 +1301,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1473,7 +1310,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1483,7 +1319,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Axis Used As Axis Provider</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1493,7 +1328,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Paste Configuration</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1503,7 +1337,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Depth</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1513,7 +1346,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Label Provider</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1523,7 +1355,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Label Provider Context</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1533,7 +1364,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Tree Filling Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1543,7 +1373,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1553,7 +1382,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1563,7 +1391,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1573,7 +1400,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1583,18 +1409,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>Tree Filling Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int TREE_FILLING_CONFIGURATION_OPERATION_COUNT = IFILLING_CONFIGURATION_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

-	 * <em>Axis Index Style</em>}' enum.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}' enum.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisIndexStyle()

 	 * @generated

@@ -1602,12 +1425,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	int AXIS_INDEX_STYLE = 12;

 

 	/**

-	 * Returns the meta object for class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration

-	 * <em>Abstract Header Axis Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration <em>Abstract Header Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Abstract Header Axis Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration

 	 * @generated

@@ -1615,12 +1435,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getAbstractHeaderAxisConfiguration();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle

-	 * <em>Index Style</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Index Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle()

 	 * @see #getAbstractHeaderAxisConfiguration()

@@ -1629,12 +1446,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getAbstractHeaderAxisConfiguration_IndexStyle();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel

-	 * <em>Display Label</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Display Label</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel()

 	 * @see #getAbstractHeaderAxisConfiguration()

@@ -1643,12 +1457,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getAbstractHeaderAxisConfiguration_DisplayLabel();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter

-	 * <em>Display Filter</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Display Filter</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter()

 	 * @see #getAbstractHeaderAxisConfiguration()

@@ -1657,12 +1468,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getAbstractHeaderAxisConfiguration_DisplayFilter();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex

-	 * <em>Display Index</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Display Index</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex()

 	 * @see #getAbstractHeaderAxisConfiguration()

@@ -1671,12 +1479,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getAbstractHeaderAxisConfiguration_DisplayIndex();

 

 	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations

-	 * <em>Owned Label Configurations</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations <em>Owned Label Configurations</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Owned Label Configurations</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedLabelConfigurations()

 	 * @see #getAbstractHeaderAxisConfiguration()

@@ -1685,12 +1490,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations();

 

 	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations

-	 * <em>Owned Axis Configurations</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations <em>Owned Axis Configurations</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Owned Axis Configurations</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getOwnedAxisConfigurations()

 	 * @see #getAbstractHeaderAxisConfiguration()

@@ -1699,12 +1501,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations();

 

 	/**

-	 * Returns the meta object for class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation

-	 * <em>Axis Manager Representation</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation <em>Axis Manager Representation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Axis Manager Representation</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation

 	 * @generated

@@ -1712,12 +1511,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getAxisManagerRepresentation();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId

-	 * <em>Axis Manager Id</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Axis Manager Id</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId()

 	 * @see #getAxisManagerRepresentation()

@@ -1726,12 +1522,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getAxisManagerRepresentation_AxisManagerId();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext

-	 * <em>Label Provider Context</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Label Provider Context</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext()

 	 * @see #getAxisManagerRepresentation()

@@ -1740,12 +1533,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getAxisManagerRepresentation_LabelProviderContext();

 

 	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration

-	 * <em>Header Label Configuration</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Header Label Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration()

 	 * @see #getAxisManagerRepresentation()

@@ -1754,12 +1544,9 @@ 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#getSpecificAxisConfigurations

-	 * <em>Specific Axis Configurations</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 Configurations</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations()

 	 * @see #getAxisManagerRepresentation()

@@ -1768,11 +1555,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getAxisManagerRepresentation_SpecificAxisConfigurations();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration

-	 * <em>Axis Manager Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration <em>Axis Manager Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Axis Manager Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration

 	 * @generated

@@ -1780,12 +1565,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getAxisManagerConfiguration();

 

 	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration

-	 * <em>Local Header Label Configuration</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Local Header Label Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration()

 	 * @see #getAxisManagerConfiguration()

@@ -1794,12 +1576,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getAxisManagerConfiguration_LocalHeaderLabelConfiguration();

 

 	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager

-	 * <em>Axis Manager</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Axis Manager</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager()

 	 * @see #getAxisManagerConfiguration()

@@ -1808,12 +1587,9 @@ 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#getLocalSpecificConfigurations

-	 * <em>Local Specific Configurations</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 Configurations</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations()

 	 * @see #getAxisManagerConfiguration()

@@ -1822,12 +1598,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	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>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration <em>Table Header Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Table Header Axis Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration

 	 * @generated

@@ -1835,12 +1608,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getTableHeaderAxisConfiguration();

 

 	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers

-	 * <em>Axis Managers</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers <em>Axis Managers</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Axis Managers</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers()

 	 * @see #getTableHeaderAxisConfiguration()

@@ -1849,12 +1619,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getTableHeaderAxisConfiguration_AxisManagers();

 

 	/**

-	 * Returns the meta object for class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration

-	 * <em>Local Table Header Axis Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration <em>Local Table Header Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Local Table Header Axis Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration

 	 * @generated

@@ -1862,12 +1629,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getLocalTableHeaderAxisConfiguration();

 

 	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations

-	 * <em>Axis Manager Configurations</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Axis Manager Configurations</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration#getAxisManagerConfigurations()

 	 * @see #getLocalTableHeaderAxisConfiguration()

@@ -1876,11 +1640,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration

-	 * <em>IAxis Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>IAxis Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration

 	 * @generated

@@ -1888,11 +1650,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getIAxisConfiguration();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration

-	 * <em>Feature Axis Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration <em>Feature Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Feature Axis Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration

 	 * @generated

@@ -1900,12 +1660,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getFeatureAxisConfiguration();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature

-	 * <em>Show Only Common Feature</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Show Only Common Feature</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature()

 	 * @see #getFeatureAxisConfiguration()

@@ -1914,11 +1671,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getFeatureAxisConfiguration_ShowOnlyCommonFeature();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration

-	 * <em>IFilling Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>IFilling Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration

 	 * @generated

@@ -1926,12 +1681,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getIFillingConfiguration();

 

 	/**

-	 * Returns the meta object for class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration

-	 * <em>EStructural Feature Value Filling Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration <em>EStructural Feature Value Filling Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>EStructural Feature Value Filling Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration

 	 * @generated

@@ -1939,12 +1691,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getEStructuralFeatureValueFillingConfiguration();

 

 	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature

-	 * <em>Listen Feature</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Listen Feature</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature()

 	 * @see #getEStructuralFeatureValueFillingConfiguration()

@@ -1953,11 +1702,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getEStructuralFeatureValueFillingConfiguration_ListenFeature();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration

-	 * <em>IPaste Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration <em>IPaste Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>IPaste Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration

 	 * @generated

@@ -1965,11 +1712,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getIPasteConfiguration();

 

 	/**

-	 * Returns the meta object for the attribute list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#getPostActions <em>Post Actions</em>}'.

+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#getPostActions <em>Post Actions</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute list '<em>Post Actions</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#getPostActions()

 	 * @see #getIPasteConfiguration()

@@ -1978,11 +1723,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getIPasteConfiguration_PostActions();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode <em>Detached Mode</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Detached Mode</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration#isDetachedMode()

 	 * @see #getIPasteConfiguration()

@@ -1991,12 +1734,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getIPasteConfiguration_DetachedMode();

 

 	/**

-	 * Returns the meta object for class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration

-	 * <em>Paste EObject Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration <em>Paste EObject Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Paste EObject Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration

 	 * @generated

@@ -2004,12 +1744,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getPasteEObjectConfiguration();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId

-	 * <em>Pasted Element Id</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId <em>Pasted Element Id</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Pasted Element Id</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId()

 	 * @see #getPasteEObjectConfiguration()

@@ -2018,12 +1755,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getPasteEObjectConfiguration_PastedElementId();

 

 	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature

-	 * <em>Paste Element Containement Feature</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Paste Element Containement Feature</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature()

 	 * @see #getPasteEObjectConfiguration()

@@ -2032,11 +1766,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getPasteEObjectConfiguration_PasteElementContainementFeature();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration

-	 * <em>Tree Filling Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration <em>Tree Filling Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Tree Filling Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration

 	 * @generated

@@ -2044,12 +1776,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EClass getTreeFillingConfiguration();

 

 	/**

-	 * Returns the meta object for the containment reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider

-	 * <em>Axis Used As Axis Provider</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference '<em>Axis Used As Axis Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider()

 	 * @see #getTreeFillingConfiguration()

@@ -2058,12 +1787,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getTreeFillingConfiguration_AxisUsedAsAxisProvider();

 

 	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration

-	 * <em>Paste Configuration</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Paste Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration()

 	 * @see #getTreeFillingConfiguration()

@@ -2072,11 +1798,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getTreeFillingConfiguration_PasteConfiguration();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Depth</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth()

 	 * @see #getTreeFillingConfiguration()

@@ -2085,12 +1809,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getTreeFillingConfiguration_Depth();

 

 	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider

-	 * <em>Label Provider</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Label Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider()

 	 * @see #getTreeFillingConfiguration()

@@ -2099,12 +1820,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getTreeFillingConfiguration_LabelProvider();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext

-	 * <em>Label Provider Context</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label Provider Context</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Label Provider Context</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext()

 	 * @see #getTreeFillingConfiguration()

@@ -2113,11 +1831,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EAttribute getTreeFillingConfiguration_LabelProviderContext();

 

 	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

-	 * <em>Axis Index Style</em>}'.

+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for enum '<em>Axis Index Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

 	 * @generated

@@ -2128,7 +1844,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -2145,18 +1860,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	interface Literals {

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl

-		 * <em>Abstract Header Axis Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl <em>Abstract Header Axis Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAbstractHeaderAxisConfiguration()

 		 * @generated

@@ -2167,7 +1878,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Index Style</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE = eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle();

@@ -2176,7 +1886,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Display Label</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel();

@@ -2185,7 +1894,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Display Filter</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER = eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayFilter();

@@ -2194,7 +1902,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Display Index</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX = eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex();

@@ -2203,7 +1910,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owned Label Configurations</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS = eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations();

@@ -2212,18 +1918,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owned Axis Configurations</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS = eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl

-		 * <em>Axis Manager Representation</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl <em>Axis Manager Representation</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisManagerRepresentation()

 		 * @generated

@@ -2234,7 +1936,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Axis Manager Id</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID = eINSTANCE.getAxisManagerRepresentation_AxisManagerId();

@@ -2243,7 +1944,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Label Provider Context</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT = eINSTANCE.getAxisManagerRepresentation_LabelProviderContext();

@@ -2252,7 +1952,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Header Label Configuration</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION = eINSTANCE.getAxisManagerRepresentation_HeaderLabelConfiguration();

@@ -2261,18 +1960,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * 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_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.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl <em>Axis Manager Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisManagerConfiguration()

 		 * @generated

@@ -2283,7 +1978,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Local Header Label Configuration</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION = eINSTANCE.getAxisManagerConfiguration_LocalHeaderLabelConfiguration();

@@ -2292,7 +1986,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Axis Manager</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER = eINSTANCE.getAxisManagerConfiguration_AxisManager();

@@ -2301,18 +1994,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * 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_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.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl <em>Table Header Axis Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getTableHeaderAxisConfiguration()

 		 * @generated

@@ -2323,18 +2012,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Axis Managers</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS = eINSTANCE.getTableHeaderAxisConfiguration_AxisManagers();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl

-		 * <em>Local Table Header Axis Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl <em>Local Table Header Axis Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getLocalTableHeaderAxisConfiguration()

 		 * @generated

@@ -2345,17 +2030,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Axis Manager Configurations</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS = eINSTANCE.getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration

-		 * <em>IAxis Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIAxisConfiguration()

 		 * @generated

@@ -2363,12 +2045,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		EClass IAXIS_CONFIGURATION = eINSTANCE.getIAxisConfiguration();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl

-		 * <em>Feature Axis Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl <em>Feature Axis Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getFeatureAxisConfiguration()

 		 * @generated

@@ -2379,17 +2058,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Show Only Common Feature</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE = eINSTANCE.getFeatureAxisConfiguration_ShowOnlyCommonFeature();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration

-		 * <em>IFilling Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIFillingConfiguration()

 		 * @generated

@@ -2397,12 +2073,9 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		EClass IFILLING_CONFIGURATION = eINSTANCE.getIFillingConfiguration();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl

-		 * <em>EStructural Feature Value Filling Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl <em>EStructural Feature Value Filling Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getEStructuralFeatureValueFillingConfiguration()

 		 * @generated

@@ -2413,18 +2086,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Listen Feature</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE = eINSTANCE.getEStructuralFeatureValueFillingConfiguration_ListenFeature();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl

-		 * <em>IPaste Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl <em>IPaste Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getIPasteConfiguration()

 		 * @generated

@@ -2435,7 +2104,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Post Actions</b></em>' attribute list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute IPASTE_CONFIGURATION__POST_ACTIONS = eINSTANCE.getIPasteConfiguration_PostActions();

@@ -2444,18 +2112,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Detached Mode</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute IPASTE_CONFIGURATION__DETACHED_MODE = eINSTANCE.getIPasteConfiguration_DetachedMode();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl

-		 * <em>Paste EObject Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl <em>Paste EObject Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getPasteEObjectConfiguration()

 		 * @generated

@@ -2466,7 +2130,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Pasted Element Id</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID = eINSTANCE.getPasteEObjectConfiguration_PastedElementId();

@@ -2475,18 +2138,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Paste Element Containement Feature</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE = eINSTANCE.getPasteEObjectConfiguration_PasteElementContainementFeature();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl

-		 * <em>Tree Filling Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl <em>Tree Filling Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getTreeFillingConfiguration()

 		 * @generated

@@ -2497,7 +2156,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Axis Used As Axis Provider</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER = eINSTANCE.getTreeFillingConfiguration_AxisUsedAsAxisProvider();

@@ -2506,7 +2164,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Paste Configuration</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION = eINSTANCE.getTreeFillingConfiguration_PasteConfiguration();

@@ -2515,7 +2172,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Depth</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute TREE_FILLING_CONFIGURATION__DEPTH = eINSTANCE.getTreeFillingConfiguration_Depth();

@@ -2524,7 +2180,6 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Label Provider</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TREE_FILLING_CONFIGURATION__LABEL_PROVIDER = eINSTANCE.getTreeFillingConfiguration_LabelProvider();

@@ -2533,17 +2188,14 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Label Provider Context</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT = eINSTANCE.getTreeFillingConfiguration_LabelProviderContext();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

-		 * <em>Axis Index Style</em>}' enum.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisIndexStyle()

 		 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java
index a04c49b00dd..a1cc369b803 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java
@@ -25,14 +25,11 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId <em>Pasted

- * Element Id</em>}</li>

- * <li>

- * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature

- * <em>Paste Element Containement Feature</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId <em>Pasted Element Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getPasteEObjectConfiguration()

  * @model

@@ -47,7 +44,6 @@ public interface PasteEObjectConfiguration extends IPasteConfiguration {
 	 * <!-- begin-model-doc -->

 	 * The String representing the EClass of the elements to create (see papyrus services types for further information)

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Pasted Element Id</em>' attribute.

 	 * @see #setPastedElementId(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getPasteEObjectConfiguration_PastedElementId()

@@ -57,14 +53,10 @@ public interface PasteEObjectConfiguration extends IPasteConfiguration {
 	String getPastedElementId();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId

-	 * <em>Pasted Element Id</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPastedElementId <em>Pasted Element Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Pasted Element Id</em>' attribute.

+	 * @param value the new value of the '<em>Pasted Element Id</em>' attribute.

 	 * @see #getPastedElementId()

 	 * @generated

 	 */

@@ -77,7 +69,6 @@ public interface PasteEObjectConfiguration extends IPasteConfiguration {
 	 * <!-- begin-model-doc -->

 	 * This field references the feature of the context of the table in which the created element will be added.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Paste Element Containement Feature</em>' reference.

 	 * @see #setPasteElementContainementFeature(EStructuralFeature)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getPasteEObjectConfiguration_PasteElementContainementFeature()

@@ -87,14 +78,10 @@ public interface PasteEObjectConfiguration extends IPasteConfiguration {
 	EStructuralFeature getPasteElementContainementFeature();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature

-	 * <em>Paste Element Containement Feature</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Paste Element Containement Feature</em>' reference.

+	 * @param value the new value of the '<em>Paste Element Containement Feature</em>' reference.

 	 * @see #getPasteElementContainementFeature()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
index 4d5691c61c2..c26e0b66efb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
@@ -25,16 +25,14 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers <em>Axis

- * Managers</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration#getAxisManagers <em>Axis Managers</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTableHeaderAxisConfiguration()

  * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='axisManagersIdUnique'"

- *        annotation=

- *        "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot axisManagersIdUnique='axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)'"

+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot axisManagersIdUnique='axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)'"

  * @generated

  */

 public interface TableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {

@@ -47,7 +45,6 @@ public interface TableHeaderAxisConfiguration extends AbstractHeaderAxisConfigur
 	 * <!-- begin-model-doc -->

 	 * This list can't be empty. The list of the AxisManager used to fill the axis.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Axis Managers</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTableHeaderAxisConfiguration_AxisManagers()

 	 * @model containment="true" required="true"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java
index b6b341e1963..7e9a3e4bbfe 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TreeFillingConfiguration.java
@@ -22,18 +22,14 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.I
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis

- * Used As Axis Provider</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste

- * Configuration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider

- * </em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label

- * Provider Context</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label Provider Context</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration()

  * @model

@@ -49,7 +45,6 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
 	 * here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Axis Used As Axis Provider</em>' containment reference.

 	 * @see #setAxisUsedAsAxisProvider(IAxis)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_AxisUsedAsAxisProvider()

@@ -59,14 +54,10 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
 	IAxis getAxisUsedAsAxisProvider();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider

-	 * <em>Axis Used As Axis Provider</em>}' containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Axis Used As Axis Provider</em>' containment reference.

+	 * @param value the new value of the '<em>Axis Used As Axis Provider</em>' containment reference.

 	 * @see #getAxisUsedAsAxisProvider()

 	 * @generated

 	 */

@@ -79,7 +70,6 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
 	 * If the meaning of the '<em>Paste 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>Paste Configuration</em>' reference.

 	 * @see #setPasteConfiguration(PasteEObjectConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_PasteConfiguration()

@@ -89,14 +79,10 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
 	PasteEObjectConfiguration getPasteConfiguration();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration

-	 * <em>Paste Configuration</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getPasteConfiguration <em>Paste Configuration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Paste Configuration</em>' reference.

+	 * @param value the new value of the '<em>Paste Configuration</em>' reference.

 	 * @see #getPasteConfiguration()

 	 * @generated

 	 */

@@ -109,7 +95,6 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
 	 * If the meaning of the '<em>Depth</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Depth</em>' attribute.

 	 * @see #setDepth(int)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_Depth()

@@ -119,13 +104,10 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
 	int getDepth();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth

-	 * <em>Depth</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getDepth <em>Depth</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Depth</em>' attribute.

+	 * @param value the new value of the '<em>Depth</em>' attribute.

 	 * @see #getDepth()

 	 * @generated

 	 */

@@ -138,7 +120,6 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
 	 * <!-- begin-model-doc -->

 	 * le label provider used to display string and image for this level in the tree

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Label Provider</em>' reference.

 	 * @see #setLabelProvider(ILabelProviderConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_LabelProvider()

@@ -148,14 +129,10 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
 	ILabelProviderConfiguration getLabelProvider();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider

-	 * <em>Label Provider</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProvider <em>Label Provider</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Label Provider</em>' reference.

+	 * @param value the new value of the '<em>Label Provider</em>' reference.

 	 * @see #getLabelProvider()

 	 * @generated

 	 */

@@ -168,7 +145,6 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
 	 * If the meaning of the '<em>Label Provider Context</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Label Provider Context</em>' attribute.

 	 * @see #setLabelProviderContext(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTreeFillingConfiguration_LabelProviderContext()

@@ -178,14 +154,10 @@ public interface TreeFillingConfiguration extends IFillingConfiguration {
 	String getLabelProviderContext();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext

-	 * <em>Label Provider Context</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration#getLabelProviderContext <em>Label Provider Context</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Label Provider Context</em>' attribute.

+	 * @param value the new value of the '<em>Label Provider Context</em>' attribute.

 	 * @see #getLabelProviderContext()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
index 0fbe4c71cd1..80ccfe1026e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
@@ -35,23 +35,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getIndexStyle <em>

- * Index Style</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayLabel <em>

- * Display Label</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayFilter

- * <em>Display Filter</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayIndex <em>

- * Display Index</em>}</li>

- * <li>

- * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedLabelConfigurations

- * <em>Owned Label Configurations</em>}</li>

- * <li>

- * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedAxisConfigurations

- * <em>Owned Axis Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getIndexStyle <em>Index Style</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayLabel <em>Display Label</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayFilter <em>Display Filter</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#isDisplayIndex <em>Display Index</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedLabelConfigurations <em>Owned Label Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractHeaderAxisConfigurationImpl#getOwnedAxisConfigurations <em>Owned Axis Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -61,7 +53,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	 * The default value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getIndexStyle()

 	 * @generated

 	 * @ordered

@@ -72,7 +63,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	 * The cached value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getIndexStyle()

 	 * @generated

 	 * @ordered

@@ -83,7 +73,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayLabel()

 	 * @generated

 	 * @ordered

@@ -94,7 +83,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayLabel()

 	 * @generated

 	 * @ordered

@@ -105,7 +93,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	 * The default value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayFilter()

 	 * @generated

 	 * @ordered

@@ -116,7 +103,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	 * The cached value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayFilter()

 	 * @generated

 	 * @ordered

@@ -127,7 +113,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	 * The default value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayIndex()

 	 * @generated

 	 * @ordered

@@ -138,7 +123,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	 * The cached value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayIndex()

 	 * @generated

 	 * @ordered

@@ -149,7 +133,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	 * The cached value of the '{@link #getOwnedLabelConfigurations() <em>Owned Label Configurations</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getOwnedLabelConfigurations()

 	 * @generated

 	 * @ordered

@@ -160,7 +143,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	 * The cached value of the '{@link #getOwnedAxisConfigurations() <em>Owned Axis Configurations</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getOwnedAxisConfigurations()

 	 * @generated

 	 * @ordered

@@ -170,7 +152,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected AbstractHeaderAxisConfigurationImpl() {

@@ -180,7 +161,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -191,7 +171,6 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -202,22 +181,19 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setIndexStyle(AxisIndexStyle newIndexStyle) {

 		AxisIndexStyle oldIndexStyle = indexStyle;

 		indexStyle = newIndexStyle == null ? INDEX_STYLE_EDEFAULT : newIndexStyle;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE, oldIndexStyle, indexStyle));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -228,22 +204,19 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDisplayLabel(boolean newDisplayLabel) {

 		boolean oldDisplayLabel = displayLabel;

 		displayLabel = newDisplayLabel;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -254,22 +227,19 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDisplayFilter(boolean newDisplayFilter) {

 		boolean oldDisplayFilter = displayFilter;

 		displayFilter = newDisplayFilter;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER, oldDisplayFilter, displayFilter));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -280,27 +250,24 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDisplayIndex(boolean newDisplayIndex) {

 		boolean oldDisplayIndex = displayIndex;

 		displayIndex = newDisplayIndex;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX, oldDisplayIndex, displayIndex));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<ILabelProviderConfiguration> getOwnedLabelConfigurations() {

-		if(ownedLabelConfigurations == null) {

+		if (ownedLabelConfigurations == null) {

 			ownedLabelConfigurations = new EObjectContainmentEList<ILabelProviderConfiguration>(ILabelProviderConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);

 		}

 		return ownedLabelConfigurations;

@@ -309,12 +276,11 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<IAxisConfiguration> getOwnedAxisConfigurations() {

-		if(ownedAxisConfigurations == null) {

+		if (ownedAxisConfigurations == null) {

 			ownedAxisConfigurations = new EObjectContainmentEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);

 		}

 		return ownedAxisConfigurations;

@@ -323,16 +289,15 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-			return ((InternalEList<?>)getOwnedLabelConfigurations()).basicRemove(otherEnd, msgs);

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-			return ((InternalEList<?>)getOwnedAxisConfigurations()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

+				return ((InternalEList<?>)getOwnedLabelConfigurations()).basicRemove(otherEnd, msgs);

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

+				return ((InternalEList<?>)getOwnedAxisConfigurations()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -340,24 +305,23 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

-			return getIndexStyle();

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

-			return isDisplayLabel();

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

-			return isDisplayFilter();

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

-			return isDisplayIndex();

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-			return getOwnedLabelConfigurations();

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-			return getOwnedAxisConfigurations();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

+				return getIndexStyle();

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

+				return isDisplayLabel();

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

+				return isDisplayFilter();

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

+				return isDisplayIndex();

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

+				return getOwnedLabelConfigurations();

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

+				return getOwnedAxisConfigurations();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -365,33 +329,32 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

-			setIndexStyle((AxisIndexStyle)newValue);

-			return;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

-			setDisplayLabel((Boolean)newValue);

-			return;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

-			setDisplayFilter((Boolean)newValue);

-			return;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

-			setDisplayIndex((Boolean)newValue);

-			return;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-			getOwnedLabelConfigurations().clear();

-			getOwnedLabelConfigurations().addAll((Collection<? extends ILabelProviderConfiguration>)newValue);

-			return;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-			getOwnedAxisConfigurations().clear();

-			getOwnedAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

+				setIndexStyle((AxisIndexStyle)newValue);

+				return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

+				setDisplayLabel((Boolean)newValue);

+				return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

+				setDisplayFilter((Boolean)newValue);

+				return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

+				setDisplayIndex((Boolean)newValue);

+				return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

+				getOwnedLabelConfigurations().clear();

+				getOwnedLabelConfigurations().addAll((Collection<? extends ILabelProviderConfiguration>)newValue);

+				return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

+				getOwnedAxisConfigurations().clear();

+				getOwnedAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -399,30 +362,29 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

-			setIndexStyle(INDEX_STYLE_EDEFAULT);

-			return;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

-			setDisplayLabel(DISPLAY_LABEL_EDEFAULT);

-			return;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

-			setDisplayFilter(DISPLAY_FILTER_EDEFAULT);

-			return;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

-			setDisplayIndex(DISPLAY_INDEX_EDEFAULT);

-			return;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-			getOwnedLabelConfigurations().clear();

-			return;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-			getOwnedAxisConfigurations().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

+				setIndexStyle(INDEX_STYLE_EDEFAULT);

+				return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

+				setDisplayLabel(DISPLAY_LABEL_EDEFAULT);

+				return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

+				setDisplayFilter(DISPLAY_FILTER_EDEFAULT);

+				return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

+				setDisplayIndex(DISPLAY_INDEX_EDEFAULT);

+				return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

+				getOwnedLabelConfigurations().clear();

+				return;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

+				getOwnedAxisConfigurations().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -430,24 +392,23 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

-			return indexStyle != INDEX_STYLE_EDEFAULT;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

-			return displayLabel != DISPLAY_LABEL_EDEFAULT;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

-			return displayFilter != DISPLAY_FILTER_EDEFAULT;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

-			return displayIndex != DISPLAY_INDEX_EDEFAULT;

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

-			return ownedLabelConfigurations != null && !ownedLabelConfigurations.isEmpty();

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

-			return ownedAxisConfigurations != null && !ownedAxisConfigurations.isEmpty();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE:

+				return indexStyle != INDEX_STYLE_EDEFAULT;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_LABEL:

+				return displayLabel != DISPLAY_LABEL_EDEFAULT;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_FILTER:

+				return displayFilter != DISPLAY_FILTER_EDEFAULT;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX:

+				return displayIndex != DISPLAY_INDEX_EDEFAULT;

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS:

+				return ownedLabelConfigurations != null && !ownedLabelConfigurations.isEmpty();

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS:

+				return ownedAxisConfigurations != null && !ownedAxisConfigurations.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -455,14 +416,12 @@ public abstract class AbstractHeaderAxisConfigurationImpl extends StyledElementI
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (indexStyle: "); //$NON-NLS-1$

 		result.append(indexStyle);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
index 52ea3c272e1..90e28505c2d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
@@ -33,17 +33,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <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#getLocalSpecificConfigurations

- * <em>Local Specific Configurations</em>}</li>

+ *   <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#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -53,7 +48,6 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	 * The cached value of the '{@link #getLocalHeaderLabelConfiguration() <em>Local Header Label Configuration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLocalHeaderLabelConfiguration()

 	 * @generated

 	 * @ordered

@@ -64,7 +58,6 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	 * The cached value of the '{@link #getAxisManager() <em>Axis Manager</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAxisManager()

 	 * @generated

 	 * @ordered

@@ -75,7 +68,6 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	 * The cached value of the '{@link #getLocalSpecificConfigurations() <em>Local Specific Configurations</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLocalSpecificConfigurations()

 	 * @generated

 	 * @ordered

@@ -85,7 +77,6 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected AxisManagerConfigurationImpl() {

@@ -95,7 +86,6 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -106,18 +96,16 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public ILabelProviderConfiguration getLocalHeaderLabelConfiguration() {

-		if(localHeaderLabelConfiguration != null && localHeaderLabelConfiguration.eIsProxy()) {

+		if (localHeaderLabelConfiguration != null && localHeaderLabelConfiguration.eIsProxy()) {

 			InternalEObject oldLocalHeaderLabelConfiguration = (InternalEObject)localHeaderLabelConfiguration;

 			localHeaderLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldLocalHeaderLabelConfiguration);

-			if(localHeaderLabelConfiguration != oldLocalHeaderLabelConfiguration) {

-				if(eNotificationRequired()) {

+			if (localHeaderLabelConfiguration != oldLocalHeaderLabelConfiguration) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION, oldLocalHeaderLabelConfiguration, localHeaderLabelConfiguration));

-				}

 			}

 		}

 		return localHeaderLabelConfiguration;

@@ -126,7 +114,6 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ILabelProviderConfiguration basicGetLocalHeaderLabelConfiguration() {

@@ -136,33 +123,29 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setLocalHeaderLabelConfiguration(ILabelProviderConfiguration newLocalHeaderLabelConfiguration) {

 		ILabelProviderConfiguration oldLocalHeaderLabelConfiguration = localHeaderLabelConfiguration;

 		localHeaderLabelConfiguration = newLocalHeaderLabelConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION, oldLocalHeaderLabelConfiguration, localHeaderLabelConfiguration));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public AxisManagerRepresentation getAxisManager() {

-		if(axisManager != null && axisManager.eIsProxy()) {

+		if (axisManager != null && axisManager.eIsProxy()) {

 			InternalEObject oldAxisManager = (InternalEObject)axisManager;

 			axisManager = (AxisManagerRepresentation)eResolveProxy(oldAxisManager);

-			if(axisManager != oldAxisManager) {

-				if(eNotificationRequired()) {

+			if (axisManager != oldAxisManager) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER, oldAxisManager, axisManager));

-				}

 			}

 		}

 		return axisManager;

@@ -171,7 +154,6 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public AxisManagerRepresentation basicGetAxisManager() {

@@ -181,27 +163,24 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setAxisManager(AxisManagerRepresentation newAxisManager) {

 		AxisManagerRepresentation oldAxisManager = axisManager;

 		axisManager = newAxisManager;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER, oldAxisManager, axisManager));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<IAxisConfiguration> getLocalSpecificConfigurations() {

-		if(localSpecificConfigurations == null) {

+		if (localSpecificConfigurations == null) {

 			localSpecificConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS);

 		}

 		return localSpecificConfigurations;

@@ -210,24 +189,19 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

-			if(resolve) {

-				return getLocalHeaderLabelConfiguration();

-			}

-			return basicGetLocalHeaderLabelConfiguration();

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

-			if(resolve) {

-				return getAxisManager();

-			}

-			return basicGetAxisManager();

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

-			return getLocalSpecificConfigurations();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

+				if (resolve) return getLocalHeaderLabelConfiguration();

+				return basicGetLocalHeaderLabelConfiguration();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

+				if (resolve) return getAxisManager();

+				return basicGetAxisManager();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

+				return getLocalSpecificConfigurations();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -235,23 +209,22 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

-			setLocalHeaderLabelConfiguration((ILabelProviderConfiguration)newValue);

-			return;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

-			setAxisManager((AxisManagerRepresentation)newValue);

-			return;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

-			getLocalSpecificConfigurations().clear();

-			getLocalSpecificConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

+				setLocalHeaderLabelConfiguration((ILabelProviderConfiguration)newValue);

+				return;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

+				setAxisManager((AxisManagerRepresentation)newValue);

+				return;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

+				getLocalSpecificConfigurations().clear();

+				getLocalSpecificConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -259,21 +232,20 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

-			setLocalHeaderLabelConfiguration((ILabelProviderConfiguration)null);

-			return;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

-			setAxisManager((AxisManagerRepresentation)null);

-			return;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

-			getLocalSpecificConfigurations().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

+				setLocalHeaderLabelConfiguration((ILabelProviderConfiguration)null);

+				return;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

+				setAxisManager((AxisManagerRepresentation)null);

+				return;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

+				getLocalSpecificConfigurations().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -281,18 +253,17 @@ public class AxisManagerConfigurationImpl extends StyledElementImpl implements A
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

-			return localHeaderLabelConfiguration != null;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

-			return axisManager != null;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

-			return localSpecificConfigurations != null && !localSpecificConfigurations.isEmpty();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION:

+				return localHeaderLabelConfiguration != null;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

+				return axisManager != null;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

+				return localSpecificConfigurations != null && !localSpecificConfigurations.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
index 366a79ad978..fee21aa50a6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
@@ -32,19 +32,13 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <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#getSpecificAxisConfigurations

- * <em>Specific Axis Configurations</em>}</li>

+ *   <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#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -54,7 +48,6 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	 * The default value of the '{@link #getAxisManagerId() <em>Axis Manager Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAxisManagerId()

 	 * @generated

 	 * @ordered

@@ -65,7 +58,6 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	 * The cached value of the '{@link #getAxisManagerId() <em>Axis Manager Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAxisManagerId()

 	 * @generated

 	 * @ordered

@@ -76,7 +68,6 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLabelProviderContext()

 	 * @generated

 	 * @ordered

@@ -87,7 +78,6 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	 * The cached value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLabelProviderContext()

 	 * @generated

 	 * @ordered

@@ -98,7 +88,6 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	 * The cached value of the '{@link #getHeaderLabelConfiguration() <em>Header Label Configuration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getHeaderLabelConfiguration()

 	 * @generated

 	 * @ordered

@@ -109,7 +98,6 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	 * The cached value of the '{@link #getSpecificAxisConfigurations() <em>Specific Axis Configurations</em>}' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getSpecificAxisConfigurations()

 	 * @generated

 	 * @ordered

@@ -119,7 +107,6 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected AxisManagerRepresentationImpl() {

@@ -129,7 +116,6 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -140,7 +126,6 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -151,22 +136,19 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setAxisManagerId(String newAxisManagerId) {

 		String oldAxisManagerId = axisManagerId;

 		axisManagerId = newAxisManagerId;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID, oldAxisManagerId, axisManagerId));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -177,33 +159,29 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setLabelProviderContext(String newLabelProviderContext) {

 		String oldLabelProviderContext = labelProviderContext;

 		labelProviderContext = newLabelProviderContext;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public ILabelProviderConfiguration getHeaderLabelConfiguration() {

-		if(headerLabelConfiguration != null && headerLabelConfiguration.eIsProxy()) {

+		if (headerLabelConfiguration != null && headerLabelConfiguration.eIsProxy()) {

 			InternalEObject oldHeaderLabelConfiguration = (InternalEObject)headerLabelConfiguration;

 			headerLabelConfiguration = (ILabelProviderConfiguration)eResolveProxy(oldHeaderLabelConfiguration);

-			if(headerLabelConfiguration != oldHeaderLabelConfiguration) {

-				if(eNotificationRequired()) {

+			if (headerLabelConfiguration != oldHeaderLabelConfiguration) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION, oldHeaderLabelConfiguration, headerLabelConfiguration));

-				}

 			}

 		}

 		return headerLabelConfiguration;

@@ -212,7 +190,6 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ILabelProviderConfiguration basicGetHeaderLabelConfiguration() {

@@ -222,27 +199,24 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setHeaderLabelConfiguration(ILabelProviderConfiguration newHeaderLabelConfiguration) {

 		ILabelProviderConfiguration oldHeaderLabelConfiguration = headerLabelConfiguration;

 		headerLabelConfiguration = newHeaderLabelConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION, oldHeaderLabelConfiguration, headerLabelConfiguration));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<IAxisConfiguration> getSpecificAxisConfigurations() {

-		if(specificAxisConfigurations == null) {

+		if (specificAxisConfigurations == null) {

 			specificAxisConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS);

 		}

 		return specificAxisConfigurations;

@@ -251,23 +225,20 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

-			return getAxisManagerId();

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

-			return getLabelProviderContext();

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

-			if(resolve) {

-				return getHeaderLabelConfiguration();

-			}

-			return basicGetHeaderLabelConfiguration();

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

-			return getSpecificAxisConfigurations();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

+				return getAxisManagerId();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

+				return getLabelProviderContext();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

+				if (resolve) return getHeaderLabelConfiguration();

+				return basicGetHeaderLabelConfiguration();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

+				return getSpecificAxisConfigurations();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -275,26 +246,25 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

-			setAxisManagerId((String)newValue);

-			return;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

-			setLabelProviderContext((String)newValue);

-			return;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

-			setHeaderLabelConfiguration((ILabelProviderConfiguration)newValue);

-			return;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

-			getSpecificAxisConfigurations().clear();

-			getSpecificAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

+				setAxisManagerId((String)newValue);

+				return;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

+				setLabelProviderContext((String)newValue);

+				return;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

+				setHeaderLabelConfiguration((ILabelProviderConfiguration)newValue);

+				return;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

+				getSpecificAxisConfigurations().clear();

+				getSpecificAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -302,24 +272,23 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

-			setAxisManagerId(AXIS_MANAGER_ID_EDEFAULT);

-			return;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

-			setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);

-			return;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

-			setHeaderLabelConfiguration((ILabelProviderConfiguration)null);

-			return;

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

-			getSpecificAxisConfigurations().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

+				setAxisManagerId(AXIS_MANAGER_ID_EDEFAULT);

+				return;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

+				setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);

+				return;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

+				setHeaderLabelConfiguration((ILabelProviderConfiguration)null);

+				return;

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

+				getSpecificAxisConfigurations().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -327,20 +296,19 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

-			return AXIS_MANAGER_ID_EDEFAULT == null ? axisManagerId != null : !AXIS_MANAGER_ID_EDEFAULT.equals(axisManagerId);

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

-			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_CONFIGURATIONS:

-			return specificAxisConfigurations != null && !specificAxisConfigurations.isEmpty();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID:

+				return AXIS_MANAGER_ID_EDEFAULT == null ? axisManagerId != null : !AXIS_MANAGER_ID_EDEFAULT.equals(axisManagerId);

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT:

+				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_CONFIGURATIONS:

+				return specificAxisConfigurations != null && !specificAxisConfigurations.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -348,14 +316,12 @@ public class AxisManagerRepresentationImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (axisManagerId: "); //$NON-NLS-1$

 		result.append(axisManagerId);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
index 44548be8a20..90419f4a4a2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
@@ -27,12 +27,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>

- * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl#getListenFeature

- * <em>Listen Feature</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.EStructuralFeatureValueFillingConfigurationImpl#getListenFeature <em>Listen Feature</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -42,7 +40,6 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
 	 * The cached value of the '{@link #getListenFeature() <em>Listen Feature</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getListenFeature()

 	 * @generated

 	 * @ordered

@@ -52,7 +49,6 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected EStructuralFeatureValueFillingConfigurationImpl() {

@@ -62,7 +58,6 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -73,18 +68,16 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EStructuralFeature getListenFeature() {

-		if(listenFeature != null && listenFeature.eIsProxy()) {

+		if (listenFeature != null && listenFeature.eIsProxy()) {

 			InternalEObject oldListenFeature = (InternalEObject)listenFeature;

 			listenFeature = (EStructuralFeature)eResolveProxy(oldListenFeature);

-			if(listenFeature != oldListenFeature) {

-				if(eNotificationRequired()) {

+			if (listenFeature != oldListenFeature) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));

-				}

 			}

 		}

 		return listenFeature;

@@ -93,7 +86,6 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EStructuralFeature basicGetListenFeature() {

@@ -103,32 +95,27 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setListenFeature(EStructuralFeature newListenFeature) {

 		EStructuralFeature oldListenFeature = listenFeature;

 		listenFeature = newListenFeature;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

-			if(resolve) {

-				return getListenFeature();

-			}

-			return basicGetListenFeature();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

+				if (resolve) return getListenFeature();

+				return basicGetListenFeature();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -136,15 +123,14 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

-			setListenFeature((EStructuralFeature)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

+				setListenFeature((EStructuralFeature)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -152,15 +138,14 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

-			setListenFeature((EStructuralFeature)null);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

+				setListenFeature((EStructuralFeature)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -168,14 +153,13 @@ public class EStructuralFeatureValueFillingConfigurationImpl extends StyledEleme
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

-			return listenFeature != null;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE:

+				return listenFeature != null;

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
index a1063201cab..a37e11ecd41 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
@@ -25,11 +25,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl#isShowOnlyCommonFeature

- * <em>Show Only Common Feature</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.FeatureAxisConfigurationImpl#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -39,7 +38,6 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
 	 * The default value of the '{@link #isShowOnlyCommonFeature() <em>Show Only Common Feature</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isShowOnlyCommonFeature()

 	 * @generated

 	 * @ordered

@@ -50,7 +48,6 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
 	 * The cached value of the '{@link #isShowOnlyCommonFeature() <em>Show Only Common Feature</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isShowOnlyCommonFeature()

 	 * @generated

 	 * @ordered

@@ -60,7 +57,6 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected FeatureAxisConfigurationImpl() {

@@ -70,7 +66,6 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -81,7 +76,6 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -92,29 +86,26 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setShowOnlyCommonFeature(boolean newShowOnlyCommonFeature) {

 		boolean oldShowOnlyCommonFeature = showOnlyCommonFeature;

 		showOnlyCommonFeature = newShowOnlyCommonFeature;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE, oldShowOnlyCommonFeature, showOnlyCommonFeature));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-			return isShowOnlyCommonFeature();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

+				return isShowOnlyCommonFeature();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -122,15 +113,14 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-			setShowOnlyCommonFeature((Boolean)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

+				setShowOnlyCommonFeature((Boolean)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -138,15 +128,14 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-			setShowOnlyCommonFeature(SHOW_ONLY_COMMON_FEATURE_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

+				setShowOnlyCommonFeature(SHOW_ONLY_COMMON_FEATURE_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -154,14 +143,13 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

-			return showOnlyCommonFeature != SHOW_ONLY_COMMON_FEATURE_EDEFAULT;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE:

+				return showOnlyCommonFeature != SHOW_ONLY_COMMON_FEATURE_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -169,14 +157,12 @@ public class FeatureAxisConfigurationImpl extends StyledElementImpl implements F
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (showOnlyCommonFeature: "); //$NON-NLS-1$

 		result.append(showOnlyCommonFeature);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
index 5292ec3ab5d..d5056c76d27 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
@@ -29,13 +29,11 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#getPostActions <em>Post Actions

- * </em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#isDetachedMode <em>Detached

- * Mode</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#getPostActions <em>Post Actions</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.IPasteConfigurationImpl#isDetachedMode <em>Detached Mode</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -45,7 +43,6 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	 * The cached value of the '{@link #getPostActions() <em>Post Actions</em>}' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getPostActions()

 	 * @generated

 	 * @ordered

@@ -56,7 +53,6 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	 * The default value of the '{@link #isDetachedMode() <em>Detached Mode</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDetachedMode()

 	 * @generated

 	 * @ordered

@@ -67,7 +63,6 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	 * The cached value of the '{@link #isDetachedMode() <em>Detached Mode</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDetachedMode()

 	 * @generated

 	 * @ordered

@@ -77,7 +72,6 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected IPasteConfigurationImpl() {

@@ -87,7 +81,6 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -98,12 +91,11 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<String> getPostActions() {

-		if(postActions == null) {

+		if (postActions == null) {

 			postActions = new EDataTypeUniqueEList<String>(String.class, this, NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS);

 		}

 		return postActions;

@@ -112,7 +104,6 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -123,31 +114,28 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDetachedMode(boolean newDetachedMode) {

 		boolean oldDetachedMode = detachedMode;

 		detachedMode = newDetachedMode;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE, oldDetachedMode, detachedMode));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

-			return getPostActions();

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

-			return isDetachedMode();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

+				return getPostActions();

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

+				return isDetachedMode();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -155,20 +143,19 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

-			getPostActions().clear();

-			getPostActions().addAll((Collection<? extends String>)newValue);

-			return;

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

-			setDetachedMode((Boolean)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

+				getPostActions().clear();

+				getPostActions().addAll((Collection<? extends String>)newValue);

+				return;

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

+				setDetachedMode((Boolean)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -176,18 +163,17 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

-			getPostActions().clear();

-			return;

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

-			setDetachedMode(DETACHED_MODE_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

+				getPostActions().clear();

+				return;

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

+				setDetachedMode(DETACHED_MODE_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -195,16 +181,15 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

-			return postActions != null && !postActions.isEmpty();

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

-			return detachedMode != DETACHED_MODE_EDEFAULT;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__POST_ACTIONS:

+				return postActions != null && !postActions.isEmpty();

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION__DETACHED_MODE:

+				return detachedMode != DETACHED_MODE_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -212,14 +197,12 @@ public class IPasteConfigurationImpl extends StyledElementImpl implements IPaste
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (postActions: "); //$NON-NLS-1$

 		result.append(postActions);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
index 746d0204d93..f38d97e404a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
@@ -30,12 +30,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>

- * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl#getAxisManagerConfigurations

- * <em>Axis Manager Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.LocalTableHeaderAxisConfigurationImpl#getAxisManagerConfigurations <em>Axis Manager Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -45,7 +43,6 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
 	 * The cached value of the '{@link #getAxisManagerConfigurations() <em>Axis Manager Configurations</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAxisManagerConfigurations()

 	 * @generated

 	 * @ordered

@@ -55,7 +52,6 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected LocalTableHeaderAxisConfigurationImpl() {

@@ -65,7 +61,6 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -76,12 +71,11 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<AxisManagerConfiguration> getAxisManagerConfigurations() {

-		if(axisManagerConfigurations == null) {

+		if (axisManagerConfigurations == null) {

 			axisManagerConfigurations = new EObjectContainmentEList<AxisManagerConfiguration>(AxisManagerConfiguration.class, this, NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);

 		}

 		return axisManagerConfigurations;

@@ -90,14 +84,13 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-			return ((InternalEList<?>)getAxisManagerConfigurations()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

+				return ((InternalEList<?>)getAxisManagerConfigurations()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -105,14 +98,13 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-			return getAxisManagerConfigurations();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

+				return getAxisManagerConfigurations();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -120,17 +112,16 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-			getAxisManagerConfigurations().clear();

-			getAxisManagerConfigurations().addAll((Collection<? extends AxisManagerConfiguration>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

+				getAxisManagerConfigurations().clear();

+				getAxisManagerConfigurations().addAll((Collection<? extends AxisManagerConfiguration>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -138,15 +129,14 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-			getAxisManagerConfigurations().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

+				getAxisManagerConfigurations().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -154,14 +144,13 @@ public class LocalTableHeaderAxisConfigurationImpl extends AbstractHeaderAxisCon
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

-			return axisManagerConfigurations != null && !axisManagerConfigurations.isEmpty();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS:

+				return axisManagerConfigurations != null && !axisManagerConfigurations.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
index 2ed5988889e..fe8c33e3e7f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
@@ -35,7 +35,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implements NattableaxisconfigurationFactory {

@@ -44,16 +43,16 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static NattableaxisconfigurationFactory init() {

 		try {

 			NattableaxisconfigurationFactory theNattableaxisconfigurationFactory = (NattableaxisconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisconfigurationPackage.eNS_URI);

-			if(theNattableaxisconfigurationFactory != null) {

+			if (theNattableaxisconfigurationFactory != null) {

 				return theNattableaxisconfigurationFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new NattableaxisconfigurationFactoryImpl();

@@ -63,7 +62,6 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableaxisconfigurationFactoryImpl() {

@@ -73,71 +71,58 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION:

-			return createAxisManagerRepresentation();

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION:

-			return createAxisManagerConfiguration();

-		case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION:

-			return createTableHeaderAxisConfiguration();

-		case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION:

-			return createLocalTableHeaderAxisConfiguration();

-		case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION:

-			return createFeatureAxisConfiguration();

-		case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION:

-			return createEStructuralFeatureValueFillingConfiguration();

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION:

-			return createIPasteConfiguration();

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION:

-			return createPasteEObjectConfiguration();

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION:

-			return createTreeFillingConfiguration();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eClass.getClassifierID()) {

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION: return createAxisManagerRepresentation();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION: return createAxisManagerConfiguration();

+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION: return createTableHeaderAxisConfiguration();

+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION: return createLocalTableHeaderAxisConfiguration();

+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION: return createFeatureAxisConfiguration();

+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION: return createEStructuralFeatureValueFillingConfiguration();

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION: return createIPasteConfiguration();

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION: return createPasteEObjectConfiguration();

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION: return createTreeFillingConfiguration();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch(eDataType.getClassifierID()) {

-		case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:

-			return createAxisIndexStyleFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eDataType.getClassifierID()) {

+			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:

+				return createAxisIndexStyleFromString(eDataType, initialValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch(eDataType.getClassifierID()) {

-		case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:

-			return convertAxisIndexStyleToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eDataType.getClassifierID()) {

+			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:

+				return convertAxisIndexStyleToString(eDataType, instanceValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -149,7 +134,6 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -161,7 +145,6 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -173,7 +156,6 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -185,7 +167,6 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -197,7 +178,6 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -209,7 +189,6 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -221,7 +200,6 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -233,7 +211,6 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -245,21 +222,17 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public AxisIndexStyle createAxisIndexStyleFromString(EDataType eDataType, String initialValue) {

 		AxisIndexStyle result = AxisIndexStyle.get(initialValue);

-		if(result == null) {

-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		}

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String convertAxisIndexStyleToString(EDataType eDataType, Object instanceValue) {

@@ -269,7 +242,6 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -280,7 +252,6 @@ public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
index 4f754ddf411..9a1bdde35a1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
@@ -59,7 +59,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattableaxisconfigurationPackageImpl extends EPackageImpl implements NattableaxisconfigurationPackage {

@@ -67,7 +66,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass abstractHeaderAxisConfigurationEClass = null;

@@ -75,7 +73,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass axisManagerRepresentationEClass = null;

@@ -83,7 +80,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass axisManagerConfigurationEClass = null;

@@ -91,7 +87,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass tableHeaderAxisConfigurationEClass = null;

@@ -99,7 +94,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass localTableHeaderAxisConfigurationEClass = null;

@@ -107,7 +101,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass iAxisConfigurationEClass = null;

@@ -115,7 +108,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass featureAxisConfigurationEClass = null;

@@ -123,7 +115,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass iFillingConfigurationEClass = null;

@@ -131,7 +122,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass eStructuralFeatureValueFillingConfigurationEClass = null;

@@ -139,7 +129,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass iPasteConfigurationEClass = null;

@@ -147,7 +136,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass pasteEObjectConfigurationEClass = null;

@@ -155,7 +143,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass treeFillingConfigurationEClass = null;

@@ -163,19 +150,19 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EEnum axisIndexStyleEEnum = null;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

 	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#eNS_URI

 	 * @see #init()

@@ -188,32 +175,32 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link NattableaxisconfigurationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it

-	 * directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * 

+	 * <p>This method is used to initialize {@link NattableaxisconfigurationPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static NattableaxisconfigurationPackage init() {

-		if(isInited) {

-			return (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);

-		}

+		if (isInited) return (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);

+

 		// Obtain or create and register package

 		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisconfigurationPackageImpl());

+

 		isInited = true;

+

 		// Initialize simple dependencies

 		EcorePackage.eINSTANCE.eClass();

+

 		// Obtain or create and register interdependencies

 		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

 		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

@@ -224,6 +211,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

 		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

 		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

+

 		// Create package meta-data objects

 		theNattableaxisconfigurationPackage.createPackageContents();

 		theNattablePackage.createPackageContents();

@@ -235,6 +223,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 		theNattablecellPackage.createPackageContents();

 		theNattableproblemPackage.createPackageContents();

 		theNattablestylePackage.createPackageContents();

+

 		// Initialize created meta-data

 		theNattableaxisconfigurationPackage.initializePackageContents();

 		theNattablePackage.initializePackageContents();

@@ -246,16 +235,20 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 		theNattablecellPackage.initializePackageContents();

 		theNattableproblemPackage.initializePackageContents();

 		theNattablestylePackage.initializePackageContents();

+

 		// Register package validator

-		EValidator.Registry.INSTANCE.put(theNattableaxisconfigurationPackage, new EValidator.Descriptor() {

+		EValidator.Registry.INSTANCE.put

+			(theNattableaxisconfigurationPackage, 

+			 new EValidator.Descriptor() {

+				 public EValidator getEValidator() {

+					 return NattableaxisconfigurationValidator.INSTANCE;

+				 }

+			 });

 

-			@Override

-			public EValidator getEValidator() {

-				return NattableaxisconfigurationValidator.INSTANCE;

-			}

-		});

 		// Mark meta-data to indicate it can't be changed

 		theNattableaxisconfigurationPackage.freeze();

+

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(NattableaxisconfigurationPackage.eNS_URI, theNattableaxisconfigurationPackage);

 		return theNattableaxisconfigurationPackage;

@@ -264,7 +257,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -275,7 +267,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -286,7 +277,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -297,7 +287,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -308,7 +297,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -319,7 +307,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -330,7 +317,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -341,7 +327,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -352,7 +337,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -363,7 +347,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -374,7 +357,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -385,7 +367,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -396,7 +377,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -407,7 +387,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -418,7 +397,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -429,7 +407,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -440,7 +417,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -451,7 +427,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -462,7 +437,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -473,7 +447,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -484,7 +457,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -495,7 +467,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -506,7 +477,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -517,7 +487,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -528,7 +497,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -539,7 +507,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -550,7 +517,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -561,7 +527,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -572,7 +537,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -583,7 +547,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -594,7 +557,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -605,7 +567,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -616,7 +577,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -627,7 +587,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -638,7 +597,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -649,7 +607,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -660,7 +617,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -671,7 +627,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -682,7 +637,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -693,7 +647,6 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -704,24 +657,21 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package. This method is

+	 * Creates the meta-model objects for the package.  This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated) {

-			return;

-		}

+		if (isCreated) return;

 		isCreated = true;

+

 		// Create classes and their features

 		abstractHeaderAxisConfigurationEClass = createEClass(ABSTRACT_HEADER_AXIS_CONFIGURATION);

 		createEAttribute(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__INDEX_STYLE);

@@ -730,37 +680,49 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 		createEAttribute(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__DISPLAY_INDEX);

 		createEReference(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_LABEL_CONFIGURATIONS);

 		createEReference(abstractHeaderAxisConfigurationEClass, ABSTRACT_HEADER_AXIS_CONFIGURATION__OWNED_AXIS_CONFIGURATIONS);

+

 		axisManagerRepresentationEClass = createEClass(AXIS_MANAGER_REPRESENTATION);

 		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_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_CONFIGURATIONS);

+

 		tableHeaderAxisConfigurationEClass = createEClass(TABLE_HEADER_AXIS_CONFIGURATION);

 		createEReference(tableHeaderAxisConfigurationEClass, TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);

+

 		localTableHeaderAxisConfigurationEClass = createEClass(LOCAL_TABLE_HEADER_AXIS_CONFIGURATION);

 		createEReference(localTableHeaderAxisConfigurationEClass, LOCAL_TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGER_CONFIGURATIONS);

+

 		iAxisConfigurationEClass = createEClass(IAXIS_CONFIGURATION);

+

 		featureAxisConfigurationEClass = createEClass(FEATURE_AXIS_CONFIGURATION);

 		createEAttribute(featureAxisConfigurationEClass, FEATURE_AXIS_CONFIGURATION__SHOW_ONLY_COMMON_FEATURE);

+

 		iFillingConfigurationEClass = createEClass(IFILLING_CONFIGURATION);

+

 		eStructuralFeatureValueFillingConfigurationEClass = createEClass(ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION);

 		createEReference(eStructuralFeatureValueFillingConfigurationEClass, ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION__LISTEN_FEATURE);

+

 		iPasteConfigurationEClass = createEClass(IPASTE_CONFIGURATION);

 		createEAttribute(iPasteConfigurationEClass, IPASTE_CONFIGURATION__POST_ACTIONS);

 		createEAttribute(iPasteConfigurationEClass, IPASTE_CONFIGURATION__DETACHED_MODE);

+

 		pasteEObjectConfigurationEClass = createEClass(PASTE_EOBJECT_CONFIGURATION);

 		createEAttribute(pasteEObjectConfigurationEClass, PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID);

 		createEReference(pasteEObjectConfigurationEClass, PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE);

+

 		treeFillingConfigurationEClass = createEClass(TREE_FILLING_CONFIGURATION);

 		createEReference(treeFillingConfigurationEClass, TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER);

 		createEReference(treeFillingConfigurationEClass, TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION);

 		createEAttribute(treeFillingConfigurationEClass, TREE_FILLING_CONFIGURATION__DEPTH);

 		createEReference(treeFillingConfigurationEClass, TREE_FILLING_CONFIGURATION__LABEL_PROVIDER);

 		createEAttribute(treeFillingConfigurationEClass, TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT);

+

 		// Create enums

 		axisIndexStyleEEnum = createEEnum(AXIS_INDEX_STYLE);

 	}

@@ -768,35 +730,36 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model. This

+	 * Complete the initialization of the package and its meta-model.  This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized) {

-			return;

-		}

+		if (isInitialized) return;

 		isInitialized = true;

+

 		// Initialize package

 		setName(eNAME);

 		setNsPrefix(eNS_PREFIX);

 		setNsURI(eNS_URI);

+

 		// Obtain other dependent packages

 		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

 		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);

 		NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);

 		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

+

 		// Create type parameters

+

 		// Set bounds for type parameters

+

 		// Add supertypes to classes

 		abstractHeaderAxisConfigurationEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());

 		axisManagerRepresentationEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());

@@ -810,6 +773,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 		iPasteConfigurationEClass.getESuperTypes().add(this.getIAxisConfiguration());

 		pasteEObjectConfigurationEClass.getESuperTypes().add(this.getIPasteConfiguration());

 		treeFillingConfigurationEClass.getESuperTypes().add(this.getIFillingConfiguration());

+

 		// Initialize classes, features, and operations; add parameters

 		initEClass(abstractHeaderAxisConfigurationEClass, AbstractHeaderAxisConfiguration.class, "AbstractHeaderAxisConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getAbstractHeaderAxisConfiguration_IndexStyle(), this.getAxisIndexStyle(), "indexStyle", null, 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

@@ -818,41 +782,54 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 		initEAttribute(getAbstractHeaderAxisConfiguration_DisplayIndex(), ecorePackage.getEBoolean(), "displayIndex", "true", 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

 		initEReference(getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "ownedLabelConfigurations", null, 0, -1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEReference(getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations(), this.getIAxisConfiguration(), null, "ownedAxisConfigurations", null, 0, -1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(axisManagerRepresentationEClass, AxisManagerRepresentation.class, "AxisManagerRepresentation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		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(), ecorePackage.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_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_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$

+

 		initEClass(localTableHeaderAxisConfigurationEClass, LocalTableHeaderAxisConfiguration.class, "LocalTableHeaderAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), this.getAxisManagerConfiguration(), null, "axisManagerConfigurations", null, 0, -1, LocalTableHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(iAxisConfigurationEClass, IAxisConfiguration.class, "IAxisConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(featureAxisConfigurationEClass, FeatureAxisConfiguration.class, "FeatureAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getFeatureAxisConfiguration_ShowOnlyCommonFeature(), ecorePackage.getEBoolean(), "showOnlyCommonFeature", null, 0, 1, FeatureAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(iFillingConfigurationEClass, IFillingConfiguration.class, "IFillingConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(eStructuralFeatureValueFillingConfigurationEClass, EStructuralFeatureValueFillingConfiguration.class, "EStructuralFeatureValueFillingConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getEStructuralFeatureValueFillingConfiguration_ListenFeature(), ecorePackage.getEStructuralFeature(), null, "listenFeature", null, 1, 1, EStructuralFeatureValueFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(iPasteConfigurationEClass, IPasteConfiguration.class, "IPasteConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getIPasteConfiguration_PostActions(), ecorePackage.getEString(), "postActions", null, 0, -1, IPasteConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEAttribute(getIPasteConfiguration_DetachedMode(), ecorePackage.getEBoolean(), "detachedMode", "true", 0, 1, IPasteConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

+

 		initEClass(pasteEObjectConfigurationEClass, PasteEObjectConfiguration.class, "PasteEObjectConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getPasteEObjectConfiguration_PastedElementId(), ecorePackage.getEString(), "pastedElementId", null, 0, 1, PasteEObjectConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEReference(getPasteEObjectConfiguration_PasteElementContainementFeature(), ecorePackage.getEStructuralFeature(), null, "pasteElementContainementFeature", null, 0, 1, PasteEObjectConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(treeFillingConfigurationEClass, TreeFillingConfiguration.class, "TreeFillingConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getTreeFillingConfiguration_AxisUsedAsAxisProvider(), theNattableaxisPackage.getIAxis(), null, "axisUsedAsAxisProvider", null, 1, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEReference(getTreeFillingConfiguration_PasteConfiguration(), this.getPasteEObjectConfiguration(), null, "pasteConfiguration", null, 0, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEAttribute(getTreeFillingConfiguration_Depth(), theEcorePackage.getEInt(), "depth", null, 0, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEReference(getTreeFillingConfiguration_LabelProvider(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "labelProvider", null, 1, 1, TreeFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEAttribute(getTreeFillingConfiguration_LabelProviderContext(), ecorePackage.getEString(), "labelProviderContext", null, 1, 1, TreeFillingConfiguration.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(axisIndexStyleEEnum, AxisIndexStyle.class, "AxisIndexStyle"); //$NON-NLS-1$

 		addEEnumLiteral(axisIndexStyleEEnum, AxisIndexStyle.ALPHABETIC);

 		addEEnumLiteral(axisIndexStyleEEnum, AxisIndexStyle.NUMERIC);

+

 		// Create annotations

 		// http://www.eclipse.org/emf/2002/Ecore

 		createEcoreAnnotations();

@@ -864,38 +841,64 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void createEcoreAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$

-		addAnnotation(this, source, new String[]{ "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-		"settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-		"validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$

-		});

-		addAnnotation(abstractHeaderAxisConfigurationEClass, source, new String[]{ "constraints", "oneObjectLabelConfigurationTypes oneFeatureLabelConfigurationTypes" //$NON-NLS-1$ //$NON-NLS-2$

-		});

-		addAnnotation(axisManagerRepresentationEClass, source, new String[]{ "constraints", "nonEmptyAxisManager" //$NON-NLS-1$ //$NON-NLS-2$

-		});

-		addAnnotation(tableHeaderAxisConfigurationEClass, source, new String[]{ "constraints", "axisManagersIdUnique" //$NON-NLS-1$ //$NON-NLS-2$

-		});

+		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$	

+		addAnnotation

+		  (this, 

+		   source, 

+		   new String[] {

+			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

+			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

+			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$

+		   });	

+		addAnnotation

+		  (abstractHeaderAxisConfigurationEClass, 

+		   source, 

+		   new String[] {

+			 "constraints", "oneObjectLabelConfigurationTypes oneFeatureLabelConfigurationTypes" //$NON-NLS-1$ //$NON-NLS-2$

+		   });	

+		addAnnotation

+		  (axisManagerRepresentationEClass, 

+		   source, 

+		   new String[] {

+			 "constraints", "nonEmptyAxisManager" //$NON-NLS-1$ //$NON-NLS-2$

+		   });	

+		addAnnotation

+		  (tableHeaderAxisConfigurationEClass, 

+		   source, 

+		   new String[] {

+			 "constraints", "axisManagersIdUnique" //$NON-NLS-1$ //$NON-NLS-2$

+		   });

 	}

 

 	/**

 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void createPivotAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$

-		addAnnotation(abstractHeaderAxisConfigurationEClass, source, new String[]{ "oneObjectLabelConfigurationTypes", "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::ObjectLabelProviderConfiguration))->size() <= 1", //$NON-NLS-1$ //$NON-NLS-2$

-		"oneFeatureLabelConfigurationTypes", "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::FeatureLabelProviderConfiguration))->size() <= 1" //$NON-NLS-1$ //$NON-NLS-2$

-		});

-		addAnnotation(axisManagerRepresentationEClass, source, new String[]{ "nonEmptyAxisManager", "not (axisManagerId.oclIsUndefined() or axisManagerId = \'\')" //$NON-NLS-1$ //$NON-NLS-2$

-		});

-		addAnnotation(tableHeaderAxisConfigurationEClass, source, new String[]{ "axisManagersIdUnique", "axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)" //$NON-NLS-1$ //$NON-NLS-2$

-		});

+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$	

+		addAnnotation

+		  (abstractHeaderAxisConfigurationEClass, 

+		   source, 

+		   new String[] {

+			 "oneObjectLabelConfigurationTypes", "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::ObjectLabelProviderConfiguration))->size() <= 1", //$NON-NLS-1$ //$NON-NLS-2$

+			 "oneFeatureLabelConfigurationTypes", "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::FeatureLabelProviderConfiguration))->size() <= 1" //$NON-NLS-1$ //$NON-NLS-2$

+		   });	

+		addAnnotation

+		  (axisManagerRepresentationEClass, 

+		   source, 

+		   new String[] {

+			 "nonEmptyAxisManager", "not (axisManagerId.oclIsUndefined() or axisManagerId = \'\')" //$NON-NLS-1$ //$NON-NLS-2$

+		   });	

+		addAnnotation

+		  (tableHeaderAxisConfigurationEClass, 

+		   source, 

+		   new String[] {

+			 "axisManagersIdUnique", "axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)" //$NON-NLS-1$ //$NON-NLS-2$

+		   });

 	}

 } // NattableaxisconfigurationPackageImpl

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java
index 62410e1d14c..107f789fbd4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java
@@ -26,14 +26,11 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl#getPastedElementId <em>

- * Pasted Element Id</em>}</li>

- * <li>

- * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl#getPasteElementContainementFeature

- * <em>Paste Element Containement Feature</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl#getPastedElementId <em>Pasted Element Id</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.PasteEObjectConfigurationImpl#getPasteElementContainementFeature <em>Paste Element Containement Feature</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -43,7 +40,6 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	 * The default value of the '{@link #getPastedElementId() <em>Pasted Element Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getPastedElementId()

 	 * @generated

 	 * @ordered

@@ -54,7 +50,6 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	 * The cached value of the '{@link #getPastedElementId() <em>Pasted Element Id</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getPastedElementId()

 	 * @generated

 	 * @ordered

@@ -65,7 +60,6 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	 * The cached value of the '{@link #getPasteElementContainementFeature() <em>Paste Element Containement Feature</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getPasteElementContainementFeature()

 	 * @generated

 	 * @ordered

@@ -75,7 +69,6 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected PasteEObjectConfigurationImpl() {

@@ -85,7 +78,6 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -96,7 +88,6 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -107,33 +98,29 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setPastedElementId(String newPastedElementId) {

 		String oldPastedElementId = pastedElementId;

 		pastedElementId = newPastedElementId;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID, oldPastedElementId, pastedElementId));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EStructuralFeature getPasteElementContainementFeature() {

-		if(pasteElementContainementFeature != null && pasteElementContainementFeature.eIsProxy()) {

+		if (pasteElementContainementFeature != null && pasteElementContainementFeature.eIsProxy()) {

 			InternalEObject oldPasteElementContainementFeature = (InternalEObject)pasteElementContainementFeature;

 			pasteElementContainementFeature = (EStructuralFeature)eResolveProxy(oldPasteElementContainementFeature);

-			if(pasteElementContainementFeature != oldPasteElementContainementFeature) {

-				if(eNotificationRequired()) {

+			if (pasteElementContainementFeature != oldPasteElementContainementFeature) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE, oldPasteElementContainementFeature, pasteElementContainementFeature));

-				}

 			}

 		}

 		return pasteElementContainementFeature;

@@ -142,7 +129,6 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EStructuralFeature basicGetPasteElementContainementFeature() {

@@ -152,34 +138,29 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setPasteElementContainementFeature(EStructuralFeature newPasteElementContainementFeature) {

 		EStructuralFeature oldPasteElementContainementFeature = pasteElementContainementFeature;

 		pasteElementContainementFeature = newPasteElementContainementFeature;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE, oldPasteElementContainementFeature, pasteElementContainementFeature));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

-			return getPastedElementId();

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

-			if(resolve) {

-				return getPasteElementContainementFeature();

-			}

-			return basicGetPasteElementContainementFeature();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

+				return getPastedElementId();

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

+				if (resolve) return getPasteElementContainementFeature();

+				return basicGetPasteElementContainementFeature();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -187,18 +168,17 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

-			setPastedElementId((String)newValue);

-			return;

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

-			setPasteElementContainementFeature((EStructuralFeature)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

+				setPastedElementId((String)newValue);

+				return;

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

+				setPasteElementContainementFeature((EStructuralFeature)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -206,18 +186,17 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

-			setPastedElementId(PASTED_ELEMENT_ID_EDEFAULT);

-			return;

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

-			setPasteElementContainementFeature((EStructuralFeature)null);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

+				setPastedElementId(PASTED_ELEMENT_ID_EDEFAULT);

+				return;

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

+				setPasteElementContainementFeature((EStructuralFeature)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -225,16 +204,15 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

-			return PASTED_ELEMENT_ID_EDEFAULT == null ? pastedElementId != null : !PASTED_ELEMENT_ID_EDEFAULT.equals(pastedElementId);

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

-			return pasteElementContainementFeature != null;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:

+				return PASTED_ELEMENT_ID_EDEFAULT == null ? pastedElementId != null : !PASTED_ELEMENT_ID_EDEFAULT.equals(pastedElementId);

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTE_ELEMENT_CONTAINEMENT_FEATURE:

+				return pasteElementContainementFeature != null;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -242,14 +220,12 @@ public class PasteEObjectConfigurationImpl extends IPasteConfigurationImpl imple
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (pastedElementId: "); //$NON-NLS-1$

 		result.append(pastedElementId);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
index f18488a8ac3..9e6a8f53999 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
@@ -30,11 +30,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl#getAxisManagers <em>

- * Axis Managers</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl#getAxisManagers <em>Axis Managers</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -44,7 +43,6 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
 	 * The cached value of the '{@link #getAxisManagers() <em>Axis Managers</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAxisManagers()

 	 * @generated

 	 * @ordered

@@ -54,7 +52,6 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected TableHeaderAxisConfigurationImpl() {

@@ -64,7 +61,6 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -75,12 +71,11 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<AxisManagerRepresentation> getAxisManagers() {

-		if(axisManagers == null) {

+		if (axisManagers == null) {

 			axisManagers = new EObjectContainmentEList<AxisManagerRepresentation>(AxisManagerRepresentation.class, this, NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);

 		}

 		return axisManagers;

@@ -89,14 +84,13 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-			return ((InternalEList<?>)getAxisManagers()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

+				return ((InternalEList<?>)getAxisManagers()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -104,14 +98,13 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-			return getAxisManagers();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

+				return getAxisManagers();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -119,17 +112,16 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-			getAxisManagers().clear();

-			getAxisManagers().addAll((Collection<? extends AxisManagerRepresentation>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

+				getAxisManagers().clear();

+				getAxisManagers().addAll((Collection<? extends AxisManagerRepresentation>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -137,15 +129,14 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-			getAxisManagers().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

+				getAxisManagers().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -153,14 +144,13 @@ public class TableHeaderAxisConfigurationImpl extends AbstractHeaderAxisConfigur
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

-			return axisManagers != null && !axisManagers.isEmpty();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS:

+				return axisManagers != null && !axisManagers.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java
index 9857670c2a5..d1a48721671 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TreeFillingConfigurationImpl.java
@@ -30,18 +30,14 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getAxisUsedAsAxisProvider

- * <em>Axis Used As Axis Provider</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getPasteConfiguration <em>

- * Paste Configuration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getDepth <em>Depth</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProvider <em>Label

- * Provider</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProviderContext

- * <em>Label Provider Context</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getAxisUsedAsAxisProvider <em>Axis Used As Axis Provider</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getPasteConfiguration <em>Paste Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getDepth <em>Depth</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProvider <em>Label Provider</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TreeFillingConfigurationImpl#getLabelProviderContext <em>Label Provider Context</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -51,7 +47,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	 * The cached value of the '{@link #getAxisUsedAsAxisProvider() <em>Axis Used As Axis Provider</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAxisUsedAsAxisProvider()

 	 * @generated

 	 * @ordered

@@ -62,7 +57,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	 * The cached value of the '{@link #getPasteConfiguration() <em>Paste Configuration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getPasteConfiguration()

 	 * @generated

 	 * @ordered

@@ -73,7 +67,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	 * The default value of the '{@link #getDepth() <em>Depth</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDepth()

 	 * @generated

 	 * @ordered

@@ -84,7 +77,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	 * The cached value of the '{@link #getDepth() <em>Depth</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDepth()

 	 * @generated

 	 * @ordered

@@ -95,7 +87,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	 * The cached value of the '{@link #getLabelProvider() <em>Label Provider</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLabelProvider()

 	 * @generated

 	 * @ordered

@@ -106,7 +97,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLabelProviderContext()

 	 * @generated

 	 * @ordered

@@ -117,7 +107,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	 * The cached value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getLabelProviderContext()

 	 * @generated

 	 * @ordered

@@ -127,7 +116,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected TreeFillingConfigurationImpl() {

@@ -137,7 +125,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -148,7 +135,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -159,19 +145,14 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider, NotificationChain msgs) {

 		IAxis oldAxisUsedAsAxisProvider = axisUsedAsAxisProvider;

 		axisUsedAsAxisProvider = newAxisUsedAsAxisProvider;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, oldAxisUsedAsAxisProvider, newAxisUsedAsAxisProvider);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -179,43 +160,36 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setAxisUsedAsAxisProvider(IAxis newAxisUsedAsAxisProvider) {

-		if(newAxisUsedAsAxisProvider != axisUsedAsAxisProvider) {

+		if (newAxisUsedAsAxisProvider != axisUsedAsAxisProvider) {

 			NotificationChain msgs = null;

-			if(axisUsedAsAxisProvider != null) {

+			if (axisUsedAsAxisProvider != null)

 				msgs = ((InternalEObject)axisUsedAsAxisProvider).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, null, msgs);

-			}

-			if(newAxisUsedAsAxisProvider != null) {

+			if (newAxisUsedAsAxisProvider != null)

 				msgs = ((InternalEObject)newAxisUsedAsAxisProvider).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, null, msgs);

-			}

 			msgs = basicSetAxisUsedAsAxisProvider(newAxisUsedAsAxisProvider, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, newAxisUsedAsAxisProvider, newAxisUsedAsAxisProvider));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER, newAxisUsedAsAxisProvider, newAxisUsedAsAxisProvider));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public PasteEObjectConfiguration getPasteConfiguration() {

-		if(pasteConfiguration != null && pasteConfiguration.eIsProxy()) {

+		if (pasteConfiguration != null && pasteConfiguration.eIsProxy()) {

 			InternalEObject oldPasteConfiguration = (InternalEObject)pasteConfiguration;

 			pasteConfiguration = (PasteEObjectConfiguration)eResolveProxy(oldPasteConfiguration);

-			if(pasteConfiguration != oldPasteConfiguration) {

-				if(eNotificationRequired()) {

+			if (pasteConfiguration != oldPasteConfiguration) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));

-				}

 			}

 		}

 		return pasteConfiguration;

@@ -224,7 +198,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public PasteEObjectConfiguration basicGetPasteConfiguration() {

@@ -234,22 +207,19 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setPasteConfiguration(PasteEObjectConfiguration newPasteConfiguration) {

 		PasteEObjectConfiguration oldPasteConfiguration = pasteConfiguration;

 		pasteConfiguration = newPasteConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION, oldPasteConfiguration, pasteConfiguration));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -260,33 +230,29 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDepth(int newDepth) {

 		int oldDepth = depth;

 		depth = newDepth;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH, oldDepth, depth));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public ILabelProviderConfiguration getLabelProvider() {

-		if(labelProvider != null && labelProvider.eIsProxy()) {

+		if (labelProvider != null && labelProvider.eIsProxy()) {

 			InternalEObject oldLabelProvider = (InternalEObject)labelProvider;

 			labelProvider = (ILabelProviderConfiguration)eResolveProxy(oldLabelProvider);

-			if(labelProvider != oldLabelProvider) {

-				if(eNotificationRequired()) {

+			if (labelProvider != oldLabelProvider) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));

-				}

 			}

 		}

 		return labelProvider;

@@ -295,7 +261,6 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public ILabelProviderConfiguration basicGetLabelProvider() {

@@ -305,22 +270,19 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setLabelProvider(ILabelProviderConfiguration newLabelProvider) {

 		ILabelProviderConfiguration oldLabelProvider = labelProvider;

 		labelProvider = newLabelProvider;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER, oldLabelProvider, labelProvider));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -331,29 +293,26 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setLabelProviderContext(String newLabelProviderContext) {

 		String oldLabelProviderContext = labelProviderContext;

 		labelProviderContext = newLabelProviderContext;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-			return basicSetAxisUsedAsAxisProvider(null, msgs);

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

+				return basicSetAxisUsedAsAxisProvider(null, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -361,28 +320,23 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-			return getAxisUsedAsAxisProvider();

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

-			if(resolve) {

-				return getPasteConfiguration();

-			}

-			return basicGetPasteConfiguration();

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

-			return getDepth();

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

-			if(resolve) {

-				return getLabelProvider();

-			}

-			return basicGetLabelProvider();

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

-			return getLabelProviderContext();

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

+				return getAxisUsedAsAxisProvider();

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

+				if (resolve) return getPasteConfiguration();

+				return basicGetPasteConfiguration();

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

+				return getDepth();

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

+				if (resolve) return getLabelProvider();

+				return basicGetLabelProvider();

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

+				return getLabelProviderContext();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -390,27 +344,26 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-			setAxisUsedAsAxisProvider((IAxis)newValue);

-			return;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

-			setPasteConfiguration((PasteEObjectConfiguration)newValue);

-			return;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

-			setDepth((Integer)newValue);

-			return;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

-			setLabelProvider((ILabelProviderConfiguration)newValue);

-			return;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

-			setLabelProviderContext((String)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

+				setAxisUsedAsAxisProvider((IAxis)newValue);

+				return;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

+				setPasteConfiguration((PasteEObjectConfiguration)newValue);

+				return;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

+				setDepth((Integer)newValue);

+				return;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

+				setLabelProvider((ILabelProviderConfiguration)newValue);

+				return;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

+				setLabelProviderContext((String)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -418,27 +371,26 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-			setAxisUsedAsAxisProvider((IAxis)null);

-			return;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

-			setPasteConfiguration((PasteEObjectConfiguration)null);

-			return;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

-			setDepth(DEPTH_EDEFAULT);

-			return;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

-			setLabelProvider((ILabelProviderConfiguration)null);

-			return;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

-			setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

+				setAxisUsedAsAxisProvider((IAxis)null);

+				return;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

+				setPasteConfiguration((PasteEObjectConfiguration)null);

+				return;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

+				setDepth(DEPTH_EDEFAULT);

+				return;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

+				setLabelProvider((ILabelProviderConfiguration)null);

+				return;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

+				setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -446,22 +398,21 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

-			return axisUsedAsAxisProvider != null;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

-			return pasteConfiguration != null;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

-			return depth != DEPTH_EDEFAULT;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

-			return labelProvider != null;

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

-			return LABEL_PROVIDER_CONTEXT_EDEFAULT == null ? labelProviderContext != null : !LABEL_PROVIDER_CONTEXT_EDEFAULT.equals(labelProviderContext);

+		switch (featureID) {

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__AXIS_USED_AS_AXIS_PROVIDER:

+				return axisUsedAsAxisProvider != null;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__PASTE_CONFIGURATION:

+				return pasteConfiguration != null;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__DEPTH:

+				return depth != DEPTH_EDEFAULT;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER:

+				return labelProvider != null;

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

+				return LABEL_PROVIDER_CONTEXT_EDEFAULT == null ? labelProviderContext != null : !LABEL_PROVIDER_CONTEXT_EDEFAULT.equals(labelProviderContext);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -469,14 +420,12 @@ public class TreeFillingConfigurationImpl extends StyledElementImpl implements T
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (depth: "); //$NON-NLS-1$

 		result.append(depth);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
index f2d6282312b..bbeccf8dda1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
@@ -37,7 +37,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

  * @generated

  */

@@ -47,7 +46,6 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattableaxisconfigurationPackage modelPackage;

@@ -56,11 +54,10 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableaxisconfigurationAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;

 		}

 	}

@@ -70,16 +67,15 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

+		if (object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

@@ -89,94 +85,76 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NattableaxisconfigurationSwitch<Adapter> modelSwitch = new NattableaxisconfigurationSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration object) {

-			return createAbstractHeaderAxisConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseAxisManagerRepresentation(AxisManagerRepresentation object) {

-			return createAxisManagerRepresentationAdapter();

-		}

-

-		@Override

-		public Adapter caseAxisManagerConfiguration(AxisManagerConfiguration object) {

-			return createAxisManagerConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseTableHeaderAxisConfiguration(TableHeaderAxisConfiguration object) {

-			return createTableHeaderAxisConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration object) {

-			return createLocalTableHeaderAxisConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseIAxisConfiguration(IAxisConfiguration object) {

-			return createIAxisConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseFeatureAxisConfiguration(FeatureAxisConfiguration object) {

-			return createFeatureAxisConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseIFillingConfiguration(IFillingConfiguration object) {

-			return createIFillingConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration object) {

-			return createEStructuralFeatureValueFillingConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseIPasteConfiguration(IPasteConfiguration object) {

-			return createIPasteConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter casePasteEObjectConfiguration(PasteEObjectConfiguration object) {

-			return createPasteEObjectConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseTreeFillingConfiguration(TreeFillingConfiguration object) {

-			return createTreeFillingConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseEModelElement(EModelElement object) {

-			return createEModelElementAdapter();

-		}

-

-		@Override

-		public Adapter caseStyledElement(StyledElement object) {

-			return createStyledElementAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

+			@Override

+			public Adapter caseAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration object) {

+				return createAbstractHeaderAxisConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseAxisManagerRepresentation(AxisManagerRepresentation object) {

+				return createAxisManagerRepresentationAdapter();

+			}

+			@Override

+			public Adapter caseAxisManagerConfiguration(AxisManagerConfiguration object) {

+				return createAxisManagerConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseTableHeaderAxisConfiguration(TableHeaderAxisConfiguration object) {

+				return createTableHeaderAxisConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration object) {

+				return createLocalTableHeaderAxisConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseIAxisConfiguration(IAxisConfiguration object) {

+				return createIAxisConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseFeatureAxisConfiguration(FeatureAxisConfiguration object) {

+				return createFeatureAxisConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseIFillingConfiguration(IFillingConfiguration object) {

+				return createIFillingConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration object) {

+				return createEStructuralFeatureValueFillingConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseIPasteConfiguration(IPasteConfiguration object) {

+				return createIPasteConfigurationAdapter();

+			}

+			@Override

+			public Adapter casePasteEObjectConfiguration(PasteEObjectConfiguration object) {

+				return createPasteEObjectConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseTreeFillingConfiguration(TreeFillingConfiguration object) {

+				return createTreeFillingConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseEModelElement(EModelElement object) {

+				return createEModelElementAdapter();

+			}

+			@Override

+			public Adapter caseStyledElement(StyledElement object) {

+				return createStyledElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *        the object to adapt.

+	 * @param target the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -186,14 +164,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration

-	 * <em>Abstract Header Axis Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration <em>Abstract Header Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration

 	 * @generated

@@ -203,14 +178,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation

-	 * <em>Axis Manager Representation</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation <em>Axis Manager Representation</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation

 	 * @generated

@@ -220,14 +192,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration

-	 * <em>Axis Manager Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration <em>Axis Manager Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration

 	 * @generated

@@ -237,14 +206,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration

-	 * <em>Table Header Axis Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration <em>Table Header Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration

 	 * @generated

@@ -254,14 +220,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration

-	 * <em>Local Table Header Axis Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration <em>Local Table Header Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration

 	 * @generated

@@ -271,13 +234,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration <em>IAxis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration

 	 * @generated

@@ -287,14 +248,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration

-	 * <em>Feature Axis Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration <em>Feature Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration

 	 * @generated

@@ -304,13 +262,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration <em>IFilling Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IFillingConfiguration

 	 * @generated

@@ -320,14 +276,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration

-	 * <em>EStructural Feature Value Filling Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration <em>EStructural Feature Value Filling Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration

 	 * @generated

@@ -337,13 +290,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration <em>IPaste Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration <em>IPaste Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration

 	 * @generated

@@ -353,14 +304,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration

-	 * <em>Paste EObject Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration <em>Paste EObject Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration

 	 * @generated

@@ -370,14 +318,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration

-	 * <em>Tree Filling Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration <em>Tree Filling Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration

 	 * @generated

@@ -392,7 +337,6 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.ecore.EModelElement

 	 * @generated

@@ -402,13 +346,11 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * <em>Styled Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

 	 * @generated

@@ -422,7 +364,6 @@ public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
index a3065fe3c63..33145894e0e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
@@ -40,7 +40,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

  * @generated

  */

@@ -50,7 +49,6 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattableaxisconfigurationPackage modelPackage;

@@ -59,11 +57,10 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableaxisconfigurationSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;

 		}

 	}

@@ -72,8 +69,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

+	 * @param ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

 	 */

@@ -86,228 +82,120 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION:

-		{

-			AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration = (AbstractHeaderAxisConfiguration)theEObject;

-			T result = caseAbstractHeaderAxisConfiguration(abstractHeaderAxisConfiguration);

-			if(result == null) {

-				result = caseStyledElement(abstractHeaderAxisConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(abstractHeaderAxisConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION:

-		{

-			AxisManagerRepresentation axisManagerRepresentation = (AxisManagerRepresentation)theEObject;

-			T result = caseAxisManagerRepresentation(axisManagerRepresentation);

-			if(result == null) {

-				result = caseStyledElement(axisManagerRepresentation);

-			}

-			if(result == null) {

-				result = caseEModelElement(axisManagerRepresentation);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION:

-		{

-			AxisManagerConfiguration axisManagerConfiguration = (AxisManagerConfiguration)theEObject;

-			T result = caseAxisManagerConfiguration(axisManagerConfiguration);

-			if(result == null) {

-				result = caseStyledElement(axisManagerConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(axisManagerConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION:

-		{

-			TableHeaderAxisConfiguration tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration)theEObject;

-			T result = caseTableHeaderAxisConfiguration(tableHeaderAxisConfiguration);

-			if(result == null) {

-				result = caseAbstractHeaderAxisConfiguration(tableHeaderAxisConfiguration);

-			}

-			if(result == null) {

-				result = caseStyledElement(tableHeaderAxisConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(tableHeaderAxisConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION:

-		{

-			LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration = (LocalTableHeaderAxisConfiguration)theEObject;

-			T result = caseLocalTableHeaderAxisConfiguration(localTableHeaderAxisConfiguration);

-			if(result == null) {

-				result = caseAbstractHeaderAxisConfiguration(localTableHeaderAxisConfiguration);

-			}

-			if(result == null) {

-				result = caseStyledElement(localTableHeaderAxisConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(localTableHeaderAxisConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION:

-		{

-			IAxisConfiguration iAxisConfiguration = (IAxisConfiguration)theEObject;

-			T result = caseIAxisConfiguration(iAxisConfiguration);

-			if(result == null) {

-				result = caseStyledElement(iAxisConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(iAxisConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION:

-		{

-			FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration)theEObject;

-			T result = caseFeatureAxisConfiguration(featureAxisConfiguration);

-			if(result == null) {

-				result = caseIAxisConfiguration(featureAxisConfiguration);

-			}

-			if(result == null) {

-				result = caseStyledElement(featureAxisConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(featureAxisConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION:

-		{

-			IFillingConfiguration iFillingConfiguration = (IFillingConfiguration)theEObject;

-			T result = caseIFillingConfiguration(iFillingConfiguration);

-			if(result == null) {

-				result = caseIAxisConfiguration(iFillingConfiguration);

-			}

-			if(result == null) {

-				result = caseStyledElement(iFillingConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(iFillingConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION:

-		{

-			EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration = (EStructuralFeatureValueFillingConfiguration)theEObject;

-			T result = caseEStructuralFeatureValueFillingConfiguration(eStructuralFeatureValueFillingConfiguration);

-			if(result == null) {

-				result = caseIFillingConfiguration(eStructuralFeatureValueFillingConfiguration);

-			}

-			if(result == null) {

-				result = caseIAxisConfiguration(eStructuralFeatureValueFillingConfiguration);

-			}

-			if(result == null) {

-				result = caseStyledElement(eStructuralFeatureValueFillingConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(eStructuralFeatureValueFillingConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION:

-		{

-			IPasteConfiguration iPasteConfiguration = (IPasteConfiguration)theEObject;

-			T result = caseIPasteConfiguration(iPasteConfiguration);

-			if(result == null) {

-				result = caseIAxisConfiguration(iPasteConfiguration);

-			}

-			if(result == null) {

-				result = caseStyledElement(iPasteConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(iPasteConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION:

-		{

-			PasteEObjectConfiguration pasteEObjectConfiguration = (PasteEObjectConfiguration)theEObject;

-			T result = casePasteEObjectConfiguration(pasteEObjectConfiguration);

-			if(result == null) {

-				result = caseIPasteConfiguration(pasteEObjectConfiguration);

-			}

-			if(result == null) {

-				result = caseIAxisConfiguration(pasteEObjectConfiguration);

-			}

-			if(result == null) {

-				result = caseStyledElement(pasteEObjectConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(pasteEObjectConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION:

-		{

-			TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration)theEObject;

-			T result = caseTreeFillingConfiguration(treeFillingConfiguration);

-			if(result == null) {

-				result = caseIFillingConfiguration(treeFillingConfiguration);

-			}

-			if(result == null) {

-				result = caseIAxisConfiguration(treeFillingConfiguration);

-			}

-			if(result == null) {

-				result = caseStyledElement(treeFillingConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(treeFillingConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+		switch (classifierID) {

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION: {

+				AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration = (AbstractHeaderAxisConfiguration)theEObject;

+				T result = caseAbstractHeaderAxisConfiguration(abstractHeaderAxisConfiguration);

+				if (result == null) result = caseStyledElement(abstractHeaderAxisConfiguration);

+				if (result == null) result = caseEModelElement(abstractHeaderAxisConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION: {

+				AxisManagerRepresentation axisManagerRepresentation = (AxisManagerRepresentation)theEObject;

+				T result = caseAxisManagerRepresentation(axisManagerRepresentation);

+				if (result == null) result = caseStyledElement(axisManagerRepresentation);

+				if (result == null) result = caseEModelElement(axisManagerRepresentation);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION: {

+				AxisManagerConfiguration axisManagerConfiguration = (AxisManagerConfiguration)theEObject;

+				T result = caseAxisManagerConfiguration(axisManagerConfiguration);

+				if (result == null) result = caseStyledElement(axisManagerConfiguration);

+				if (result == null) result = caseEModelElement(axisManagerConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION: {

+				TableHeaderAxisConfiguration tableHeaderAxisConfiguration = (TableHeaderAxisConfiguration)theEObject;

+				T result = caseTableHeaderAxisConfiguration(tableHeaderAxisConfiguration);

+				if (result == null) result = caseAbstractHeaderAxisConfiguration(tableHeaderAxisConfiguration);

+				if (result == null) result = caseStyledElement(tableHeaderAxisConfiguration);

+				if (result == null) result = caseEModelElement(tableHeaderAxisConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION: {

+				LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration = (LocalTableHeaderAxisConfiguration)theEObject;

+				T result = caseLocalTableHeaderAxisConfiguration(localTableHeaderAxisConfiguration);

+				if (result == null) result = caseAbstractHeaderAxisConfiguration(localTableHeaderAxisConfiguration);

+				if (result == null) result = caseStyledElement(localTableHeaderAxisConfiguration);

+				if (result == null) result = caseEModelElement(localTableHeaderAxisConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION: {

+				IAxisConfiguration iAxisConfiguration = (IAxisConfiguration)theEObject;

+				T result = caseIAxisConfiguration(iAxisConfiguration);

+				if (result == null) result = caseStyledElement(iAxisConfiguration);

+				if (result == null) result = caseEModelElement(iAxisConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION: {

+				FeatureAxisConfiguration featureAxisConfiguration = (FeatureAxisConfiguration)theEObject;

+				T result = caseFeatureAxisConfiguration(featureAxisConfiguration);

+				if (result == null) result = caseIAxisConfiguration(featureAxisConfiguration);

+				if (result == null) result = caseStyledElement(featureAxisConfiguration);

+				if (result == null) result = caseEModelElement(featureAxisConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION: {

+				IFillingConfiguration iFillingConfiguration = (IFillingConfiguration)theEObject;

+				T result = caseIFillingConfiguration(iFillingConfiguration);

+				if (result == null) result = caseIAxisConfiguration(iFillingConfiguration);

+				if (result == null) result = caseStyledElement(iFillingConfiguration);

+				if (result == null) result = caseEModelElement(iFillingConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION: {

+				EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration = (EStructuralFeatureValueFillingConfiguration)theEObject;

+				T result = caseEStructuralFeatureValueFillingConfiguration(eStructuralFeatureValueFillingConfiguration);

+				if (result == null) result = caseIFillingConfiguration(eStructuralFeatureValueFillingConfiguration);

+				if (result == null) result = caseIAxisConfiguration(eStructuralFeatureValueFillingConfiguration);

+				if (result == null) result = caseStyledElement(eStructuralFeatureValueFillingConfiguration);

+				if (result == null) result = caseEModelElement(eStructuralFeatureValueFillingConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION: {

+				IPasteConfiguration iPasteConfiguration = (IPasteConfiguration)theEObject;

+				T result = caseIPasteConfiguration(iPasteConfiguration);

+				if (result == null) result = caseIAxisConfiguration(iPasteConfiguration);

+				if (result == null) result = caseStyledElement(iPasteConfiguration);

+				if (result == null) result = caseEModelElement(iPasteConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION: {

+				PasteEObjectConfiguration pasteEObjectConfiguration = (PasteEObjectConfiguration)theEObject;

+				T result = casePasteEObjectConfiguration(pasteEObjectConfiguration);

+				if (result == null) result = caseIPasteConfiguration(pasteEObjectConfiguration);

+				if (result == null) result = caseIAxisConfiguration(pasteEObjectConfiguration);

+				if (result == null) result = caseStyledElement(pasteEObjectConfiguration);

+				if (result == null) result = caseEModelElement(pasteEObjectConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION: {

+				TreeFillingConfiguration treeFillingConfiguration = (TreeFillingConfiguration)theEObject;

+				T result = caseTreeFillingConfiguration(treeFillingConfiguration);

+				if (result == null) result = caseIFillingConfiguration(treeFillingConfiguration);

+				if (result == null) result = caseIAxisConfiguration(treeFillingConfiguration);

+				if (result == null) result = caseStyledElement(treeFillingConfiguration);

+				if (result == null) result = caseEModelElement(treeFillingConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -317,9 +205,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Abstract Header Axis Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -334,9 +220,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Axis Manager Representation</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -351,9 +235,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Axis Manager Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -368,9 +250,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Table Header Axis Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -385,9 +265,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Local Table Header Axis Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -402,9 +280,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>IAxis Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -419,9 +295,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Axis Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -436,9 +310,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>IFilling Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -453,9 +325,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EStructural Feature Value Filling Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -470,9 +340,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>IPaste Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -487,9 +355,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Paste EObject Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -504,9 +370,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Tree Filling Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -521,9 +385,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -538,9 +400,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -555,9 +415,7 @@ public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java
index 563bb2d3f5e..1f622916ce7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java
@@ -38,7 +38,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
  * <!-- begin-user-doc -->

  * The <b>Validator</b> for the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

  * @generated

  */

@@ -48,17 +47,14 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static final NattableaxisconfigurationValidator INSTANCE = new NattableaxisconfigurationValidator();

 

 	/**

-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic

-	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

 	 * @generated

@@ -69,7 +65,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;

@@ -78,7 +73,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

@@ -87,7 +81,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableaxisconfigurationValidator() {

@@ -98,93 +91,70 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * Returns the package of this validator switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	protected EPackage getEPackage() {

-		return NattableaxisconfigurationPackage.eINSTANCE;

+	  return NattableaxisconfigurationPackage.eINSTANCE;

 	}

 

 	/**

 	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		switch(classifierID) {

-		case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION:

-			return validateAbstractHeaderAxisConfiguration((AbstractHeaderAxisConfiguration)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION:

-			return validateAxisManagerRepresentation((AxisManagerRepresentation)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION:

-			return validateAxisManagerConfiguration((AxisManagerConfiguration)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION:

-			return validateTableHeaderAxisConfiguration((TableHeaderAxisConfiguration)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION:

-			return validateLocalTableHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION:

-			return validateIAxisConfiguration((IAxisConfiguration)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION:

-			return validateFeatureAxisConfiguration((FeatureAxisConfiguration)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION:

-			return validateIFillingConfiguration((IFillingConfiguration)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION:

-			return validateEStructuralFeatureValueFillingConfiguration((EStructuralFeatureValueFillingConfiguration)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION:

-			return validateIPasteConfiguration((IPasteConfiguration)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION:

-			return validatePasteEObjectConfiguration((PasteEObjectConfiguration)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION:

-			return validateTreeFillingConfiguration((TreeFillingConfiguration)value, diagnostics, context);

-		case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:

-			return validateAxisIndexStyle((AxisIndexStyle)value, diagnostics, context);

-		default:

-			return true;

+		switch (classifierID) {

+			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION:

+				return validateAbstractHeaderAxisConfiguration((AbstractHeaderAxisConfiguration)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION:

+				return validateAxisManagerRepresentation((AxisManagerRepresentation)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION:

+				return validateAxisManagerConfiguration((AxisManagerConfiguration)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION:

+				return validateTableHeaderAxisConfiguration((TableHeaderAxisConfiguration)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION:

+				return validateLocalTableHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION:

+				return validateIAxisConfiguration((IAxisConfiguration)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION:

+				return validateFeatureAxisConfiguration((FeatureAxisConfiguration)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION:

+				return validateIFillingConfiguration((IFillingConfiguration)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION:

+				return validateEStructuralFeatureValueFillingConfiguration((EStructuralFeatureValueFillingConfiguration)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION:

+				return validateIPasteConfiguration((IPasteConfiguration)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION:

+				return validatePasteEObjectConfiguration((PasteEObjectConfiguration)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.TREE_FILLING_CONFIGURATION:

+				return validateTreeFillingConfiguration((TreeFillingConfiguration)value, diagnostics, context);

+			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:

+				return validateAxisIndexStyle((AxisIndexStyle)value, diagnostics, context);

+			default:

+				return true;

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if(!validate_NoCircularContainment(abstractHeaderAxisConfiguration, diagnostics, context)) {

-			return false;

-		}

+		if (!validate_NoCircularContainment(abstractHeaderAxisConfiguration, diagnostics, context)) return false;

 		boolean result = validate_EveryMultiplicityConforms(abstractHeaderAxisConfiguration, diagnostics, context);

-		if(result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(abstractHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(abstractHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(abstractHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(abstractHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_UniqueID(abstractHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(abstractHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(abstractHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(abstractHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(abstractHeaderAxisConfiguration, diagnostics, context);

-		}

+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(abstractHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(abstractHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(abstractHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(abstractHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_UniqueID(abstractHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(abstractHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(abstractHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(abstractHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(abstractHeaderAxisConfiguration, diagnostics, context);

 		return result;

 	}

 

@@ -192,7 +162,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * The cached validation expression for the oneObjectLabelConfigurationTypes constraint of '<em>Abstract Header Axis Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_OBJECT_LABEL_CONFIGURATION_TYPES__EEXPRESSION = "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::ObjectLabelProviderConfiguration))->size() <= 1"; //$NON-NLS-1$

@@ -201,20 +170,27 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * Validates the oneObjectLabelConfigurationTypes constraint of '<em>Abstract Header Axis Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION, abstractHeaderAxisConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"oneObjectLabelConfigurationTypes", //$NON-NLS-1$

-			ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_OBJECT_LABEL_CONFIGURATION_TYPES__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION,

+				 abstractHeaderAxisConfiguration,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "oneObjectLabelConfigurationTypes", //$NON-NLS-1$

+				 ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_OBJECT_LABEL_CONFIGURATION_TYPES__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * The cached validation expression for the oneFeatureLabelConfigurationTypes constraint of '<em>Abstract Header Axis Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_FEATURE_LABEL_CONFIGURATION_TYPES__EEXPRESSION = "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::FeatureLabelProviderConfiguration))->size() <= 1"; //$NON-NLS-1$

@@ -223,50 +199,39 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * Validates the oneFeatureLabelConfigurationTypes constraint of '<em>Abstract Header Axis Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION, abstractHeaderAxisConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"oneFeatureLabelConfigurationTypes", //$NON-NLS-1$

-			ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_FEATURE_LABEL_CONFIGURATION_TYPES__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION,

+				 abstractHeaderAxisConfiguration,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "oneFeatureLabelConfigurationTypes", //$NON-NLS-1$

+				 ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_FEATURE_LABEL_CONFIGURATION_TYPES__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateAxisManagerRepresentation(AxisManagerRepresentation axisManagerRepresentation, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if(!validate_NoCircularContainment(axisManagerRepresentation, diagnostics, context)) {

-			return false;

-		}

+		if (!validate_NoCircularContainment(axisManagerRepresentation, diagnostics, context)) return false;

 		boolean result = validate_EveryMultiplicityConforms(axisManagerRepresentation, diagnostics, context);

-		if(result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(axisManagerRepresentation, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(axisManagerRepresentation, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(axisManagerRepresentation, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(axisManagerRepresentation, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_UniqueID(axisManagerRepresentation, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(axisManagerRepresentation, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(axisManagerRepresentation, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateAxisManagerRepresentation_nonEmptyAxisManager(axisManagerRepresentation, diagnostics, context);

-		}

+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(axisManagerRepresentation, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(axisManagerRepresentation, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(axisManagerRepresentation, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(axisManagerRepresentation, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_UniqueID(axisManagerRepresentation, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(axisManagerRepresentation, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(axisManagerRepresentation, diagnostics, context);

+		if (result || diagnostics != null) result &= validateAxisManagerRepresentation_nonEmptyAxisManager(axisManagerRepresentation, diagnostics, context);

 		return result;

 	}

 

@@ -274,7 +239,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * The cached validation expression for the nonEmptyAxisManager constraint of '<em>Axis Manager Representation</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String AXIS_MANAGER_REPRESENTATION__NON_EMPTY_AXIS_MANAGER__EEXPRESSION = "not (axisManagerId.oclIsUndefined() or axisManagerId = '')"; //$NON-NLS-1$

@@ -283,19 +247,26 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * Validates the nonEmptyAxisManager constraint of '<em>Axis Manager Representation</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateAxisManagerRepresentation_nonEmptyAxisManager(AxisManagerRepresentation axisManagerRepresentation, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION, axisManagerRepresentation, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"nonEmptyAxisManager", //$NON-NLS-1$

-			AXIS_MANAGER_REPRESENTATION__NON_EMPTY_AXIS_MANAGER__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattableaxisconfigurationPackage.Literals.AXIS_MANAGER_REPRESENTATION,

+				 axisManagerRepresentation,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "nonEmptyAxisManager", //$NON-NLS-1$

+				 AXIS_MANAGER_REPRESENTATION__NON_EMPTY_AXIS_MANAGER__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateAxisManagerConfiguration(AxisManagerConfiguration axisManagerConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

@@ -305,44 +276,21 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTableHeaderAxisConfiguration(TableHeaderAxisConfiguration tableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if(!validate_NoCircularContainment(tableHeaderAxisConfiguration, diagnostics, context)) {

-			return false;

-		}

+		if (!validate_NoCircularContainment(tableHeaderAxisConfiguration, diagnostics, context)) return false;

 		boolean result = validate_EveryMultiplicityConforms(tableHeaderAxisConfiguration, diagnostics, context);

-		if(result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(tableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(tableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(tableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(tableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_UniqueID(tableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(tableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(tableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(tableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(tableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateTableHeaderAxisConfiguration_axisManagersIdUnique(tableHeaderAxisConfiguration, diagnostics, context);

-		}

+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(tableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(tableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(tableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(tableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_UniqueID(tableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(tableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(tableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(tableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(tableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateTableHeaderAxisConfiguration_axisManagersIdUnique(tableHeaderAxisConfiguration, diagnostics, context);

 		return result;

 	}

 

@@ -350,7 +298,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * The cached validation expression for the axisManagersIdUnique constraint of '<em>Table Header Axis Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS_ID_UNIQUE__EEXPRESSION = "axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)"; //$NON-NLS-1$

@@ -359,60 +306,46 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * Validates the axisManagersIdUnique constraint of '<em>Table Header Axis Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTableHeaderAxisConfiguration_axisManagersIdUnique(TableHeaderAxisConfiguration tableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION, tableHeaderAxisConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"axisManagersIdUnique", //$NON-NLS-1$

-			TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS_ID_UNIQUE__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION,

+				 tableHeaderAxisConfiguration,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "axisManagersIdUnique", //$NON-NLS-1$

+				 TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS_ID_UNIQUE__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if(!validate_NoCircularContainment(localTableHeaderAxisConfiguration, diagnostics, context)) {

-			return false;

-		}

+		if (!validate_NoCircularContainment(localTableHeaderAxisConfiguration, diagnostics, context)) return false;

 		boolean result = validate_EveryMultiplicityConforms(localTableHeaderAxisConfiguration, diagnostics, context);

-		if(result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(localTableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(localTableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(localTableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(localTableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_UniqueID(localTableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(localTableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(localTableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(localTableHeaderAxisConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(localTableHeaderAxisConfiguration, diagnostics, context);

-		}

+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(localTableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(localTableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(localTableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(localTableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_UniqueID(localTableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(localTableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(localTableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(localTableHeaderAxisConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(localTableHeaderAxisConfiguration, diagnostics, context);

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateIAxisConfiguration(IAxisConfiguration iAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

@@ -422,7 +355,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateFeatureAxisConfiguration(FeatureAxisConfiguration featureAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

@@ -432,7 +364,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateIFillingConfiguration(IFillingConfiguration iFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

@@ -442,7 +373,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

@@ -452,7 +382,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateIPasteConfiguration(IPasteConfiguration iPasteConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

@@ -462,7 +391,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validatePasteEObjectConfiguration(PasteEObjectConfiguration pasteEObjectConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

@@ -472,7 +400,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTreeFillingConfiguration(TreeFillingConfiguration treeFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

@@ -482,7 +409,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateAxisIndexStyle(AxisIndexStyle axisIndexStyle, DiagnosticChain diagnostics, Map<Object, Object> context) {

@@ -493,7 +419,6 @@ public class NattableaxisconfigurationValidator extends EObjectValidator {
 	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
index 63d5159e415..6cdfde7b473 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
@@ -39,9 +39,8 @@ public interface AbstractAxisProvider extends TableNamedElement {
 	 * This method must returns the IAxis owned by the AxisProvider.

 	 * Warning, in case of syncrhonized table, the list often will be empty. This method

 	 * only returns the IAxis serialized in the model. Displayed elements are not necessary serialized.

-	 *

+	 * 

 	 * <!-- end-model-doc -->

-	 *

 	 * @model kind="operation"

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
index bb8c51d45ba..12d96f4da30 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
@@ -26,10 +26,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAxisProvider()

  * @model abstract="true"

@@ -45,7 +45,6 @@ public interface AxisProvider extends AbstractAxisProvider {
 	 * <!-- begin-model-doc -->

 	 * IAxis owned by the AxisProvider. The list can be empty in case of synchronized table.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Axis</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAxisProvider_Axis()

 	 * @model containment="true"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
index 610660f38f5..c58555f995a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
@@ -18,16 +18,16 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;
  * <!-- end-user-doc -->

  *

  * <!-- begin-model-doc -->

- * Interface used to distinghuish master axis provider from slave axis provider.

+ * Interface used to distinghuish master axis provider from slave axis provider. 

  * The master are able to disconnect the slave.

  * <!-- end-model-doc -->

  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider()

  * @model interface="true" abstract="true"

@@ -42,7 +42,6 @@ public interface IMasterAxisProvider extends AxisProvider {
 	 * <!-- begin-model-doc -->

 	 * if true, the slave won't be updated when the elements owned by the master will be changed.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Disconnect Slave</em>' attribute.

 	 * @see #setDisconnectSlave(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider_DisconnectSlave()

@@ -52,13 +51,10 @@ public interface IMasterAxisProvider extends AxisProvider {
 	boolean isDisconnectSlave();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave

-	 * <em>Disconnect Slave</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Disconnect Slave</em>' attribute.

+	 * @param value the new value of the '<em>Disconnect Slave</em>' attribute.

 	 * @see #isDisconnectSlave()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
index 0947becb5ec..648fc39977b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage

  * @generated

  */

@@ -29,7 +28,6 @@ public interface NattableaxisproviderFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattableaxisproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderFactoryImpl.init();

@@ -38,7 +36,6 @@ public interface NattableaxisproviderFactory extends EFactory {
 	 * Returns a new object of class '<em>Slave Object Axis Provider</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Slave Object Axis Provider</em>'.

 	 * @generated

 	 */

@@ -48,7 +45,6 @@ public interface NattableaxisproviderFactory extends EFactory {
 	 * Returns a new object of class '<em>Master Object Axis Provider</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Master Object Axis Provider</em>'.

 	 * @generated

 	 */

@@ -58,7 +54,6 @@ public interface NattableaxisproviderFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
index 269ead2bc77..ec926bd0bf8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
@@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.N
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory

  * @model kind="package"

  * @generated

@@ -42,7 +41,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNAME = "nattableaxisprovider"; //$NON-NLS-1$

@@ -51,7 +49,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"; //$NON-NLS-1$

@@ -60,7 +57,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "nattableaxisprovider"; //$NON-NLS-1$

@@ -69,17 +65,14 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattableaxisproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl

-	 * <em>Abstract Axis Provider</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()

 	 * @generated

@@ -90,7 +83,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -100,7 +92,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -110,7 +101,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -120,7 +110,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -130,7 +119,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of structural features of the '<em>Abstract Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -140,7 +128,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -150,7 +137,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -160,7 +146,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -170,7 +155,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -180,7 +164,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Axis</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -190,18 +173,15 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of operations of the '<em>Abstract Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 1;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl

-	 * <em>Axis Provider</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl <em>Axis Provider</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAxisProvider()

 	 * @generated

@@ -212,7 +192,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -222,7 +201,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -232,7 +210,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -242,7 +219,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -252,7 +228,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -262,7 +237,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of structural features of the '<em>Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -272,7 +246,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -282,7 +255,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -292,7 +264,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -302,7 +273,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -312,7 +282,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Axis</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -322,18 +291,15 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of operations of the '<em>Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int AXIS_PROVIDER_OPERATION_COUNT = ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider

-	 * <em>IMaster Axis Provider</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getIMasterAxisProvider()

 	 * @generated

@@ -344,7 +310,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -354,7 +319,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -364,7 +328,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -374,7 +337,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -384,7 +346,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -394,7 +355,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Disconnect Slave</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -404,7 +364,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of structural features of the '<em>IMaster Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -414,7 +373,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -424,7 +382,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -434,7 +391,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -444,7 +400,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -454,7 +409,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Axis</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -464,18 +418,15 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of operations of the '<em>IMaster Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int IMASTER_AXIS_PROVIDER_OPERATION_COUNT = AXIS_PROVIDER_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

-	 * <em>ISlave Axis Provider</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getISlaveAxisProvider()

 	 * @generated

@@ -486,7 +437,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -496,7 +446,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -506,7 +455,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -516,7 +464,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -526,7 +473,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -536,7 +482,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of structural features of the '<em>ISlave Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -546,7 +491,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -556,7 +500,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -566,7 +509,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -576,7 +518,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -586,7 +527,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Axis</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -596,18 +536,15 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of operations of the '<em>ISlave Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int ISLAVE_AXIS_PROVIDER_OPERATION_COUNT = AXIS_PROVIDER_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl

-	 * <em>Slave Object Axis Provider</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl <em>Slave Object Axis Provider</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getSlaveObjectAxisProvider()

 	 * @generated

@@ -618,7 +555,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -628,7 +564,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -638,7 +573,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -648,7 +582,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -658,7 +591,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -668,7 +600,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of structural features of the '<em>Slave Object Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -678,7 +609,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -688,7 +618,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -698,7 +627,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -708,7 +636,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -718,7 +645,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Axis</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -728,18 +654,15 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of operations of the '<em>Slave Object Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int SLAVE_OBJECT_AXIS_PROVIDER_OPERATION_COUNT = ISLAVE_AXIS_PROVIDER_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl

-	 * <em>Master Object Axis Provider</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl <em>Master Object Axis Provider</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getMasterObjectAxisProvider()

 	 * @generated

@@ -750,7 +673,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -760,7 +682,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -770,7 +691,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -780,7 +700,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -790,7 +709,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -800,7 +718,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Disconnect Slave</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -810,7 +727,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of structural features of the '<em>Master Object Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -820,7 +736,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -830,7 +745,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -840,7 +754,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -850,7 +763,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -860,7 +772,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Axis</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -870,18 +781,15 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * The number of operations of the '<em>Master Object Axis Provider</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int MASTER_OBJECT_AXIS_PROVIDER_OPERATION_COUNT = IMASTER_AXIS_PROVIDER_OPERATION_COUNT + 0;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider

-	 * <em>Abstract Axis Provider</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Abstract Axis Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider

 	 * @generated

@@ -889,11 +797,9 @@ public interface NattableaxisproviderPackage extends EPackage {
 	EClass getAbstractAxisProvider();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis()

-	 * <em>Get Axis</em>}' operation.

+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis() <em>Get Axis</em>}' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the '<em>Get Axis</em>' operation.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis()

 	 * @generated

@@ -901,11 +807,9 @@ public interface NattableaxisproviderPackage extends EPackage {
 	EOperation getAbstractAxisProvider__GetAxis();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider

-	 * <em>IMaster Axis Provider</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>IMaster Axis Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider

 	 * @generated

@@ -913,12 +817,9 @@ public interface NattableaxisproviderPackage extends EPackage {
 	EClass getIMasterAxisProvider();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}

-	 * '.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Disconnect Slave</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave()

 	 * @see #getIMasterAxisProvider()

@@ -927,11 +828,9 @@ public interface NattableaxisproviderPackage extends EPackage {
 	EAttribute getIMasterAxisProvider_DisconnectSlave();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

-	 * <em>ISlave Axis Provider</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>ISlave Axis Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

 	 * @generated

@@ -939,11 +838,9 @@ public interface NattableaxisproviderPackage extends EPackage {
 	EClass getISlaveAxisProvider();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider

-	 * <em>Axis Provider</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider <em>Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Axis Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider

 	 * @generated

@@ -951,11 +848,9 @@ public interface NattableaxisproviderPackage extends EPackage {
 	EClass getAxisProvider();

 

 	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis <em>Axis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Axis</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider#getAxis()

 	 * @see #getAxisProvider()

@@ -964,11 +859,9 @@ public interface NattableaxisproviderPackage extends EPackage {
 	EReference getAxisProvider_Axis();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider

-	 * <em>Slave Object Axis Provider</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider <em>Slave Object Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Slave Object Axis Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider

 	 * @generated

@@ -976,11 +869,9 @@ public interface NattableaxisproviderPackage extends EPackage {
 	EClass getSlaveObjectAxisProvider();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider

-	 * <em>Master Object Axis Provider</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider <em>Master Object Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Master Object Axis Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider

 	 * @generated

@@ -991,7 +882,6 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -1008,18 +898,14 @@ public interface NattableaxisproviderPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	interface Literals {

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl

-		 * <em>Abstract Axis Provider</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()

 		 * @generated

@@ -1030,17 +916,14 @@ public interface NattableaxisproviderPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Get Axis</b></em>' operation.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EOperation ABSTRACT_AXIS_PROVIDER___GET_AXIS = eINSTANCE.getAbstractAxisProvider__GetAxis();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider

-		 * <em>IMaster Axis Provider</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getIMasterAxisProvider()

 		 * @generated

@@ -1051,17 +934,14 @@ public interface NattableaxisproviderPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Disconnect Slave</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE = eINSTANCE.getIMasterAxisProvider_DisconnectSlave();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

-		 * <em>ISlave Axis Provider</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getISlaveAxisProvider()

 		 * @generated

@@ -1069,11 +949,9 @@ public interface NattableaxisproviderPackage extends EPackage {
 		EClass ISLAVE_AXIS_PROVIDER = eINSTANCE.getISlaveAxisProvider();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl

-		 * <em>Axis Provider</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl <em>Axis Provider</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAxisProvider()

 		 * @generated

@@ -1084,18 +962,14 @@ public interface NattableaxisproviderPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Axis</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference AXIS_PROVIDER__AXIS = eINSTANCE.getAxisProvider_Axis();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl

-		 * <em>Slave Object Axis Provider</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl <em>Slave Object Axis Provider</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.SlaveObjectAxisProviderImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getSlaveObjectAxisProvider()

 		 * @generated

@@ -1103,12 +977,9 @@ public interface NattableaxisproviderPackage extends EPackage {
 		EClass SLAVE_OBJECT_AXIS_PROVIDER = eINSTANCE.getSlaveObjectAxisProvider();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl

-		 * <em>Master Object Axis Provider</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl <em>Master Object Axis Provider</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getMasterObjectAxisProvider()

 		 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
index c46b60fe820..a2bf773b9e3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
@@ -25,8 +25,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.i
  * <!-- begin-user-doc -->

  * An implementation of the model object '<em><b>Abstract Axis Provider</b></em>'.

  * <!-- end-user-doc -->

- * <p>

- * </p>

  *

  * @generated

  */

@@ -35,7 +33,6 @@ public abstract class AbstractAxisProviderImpl extends TableNamedElementImpl imp
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected AbstractAxisProviderImpl() {

@@ -45,7 +42,6 @@ public abstract class AbstractAxisProviderImpl extends TableNamedElementImpl imp
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -56,7 +52,6 @@ public abstract class AbstractAxisProviderImpl extends TableNamedElementImpl imp
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -69,14 +64,13 @@ public abstract class AbstractAxisProviderImpl extends TableNamedElementImpl imp
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch(operationID) {

-		case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER___GET_AXIS:

-			return getAxis();

+		switch (operationID) {

+			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER___GET_AXIS:

+				return getAxis();

 		}

 		return super.eInvoke(operationID, arguments);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
index 629d41a71a3..3319b57e1bf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
@@ -30,10 +30,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl#getAxis <em>Axis</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisProviderImpl#getAxis <em>Axis</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -43,7 +43,6 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
 	 * The cached value of the '{@link #getAxis() <em>Axis</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAxis()

 	 * @generated

 	 * @ordered

@@ -53,7 +52,6 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected AxisProviderImpl() {

@@ -63,7 +61,6 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -74,12 +71,11 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<IAxis> getAxis() {

-		if(axis == null) {

+		if (axis == null) {

 			axis = new EObjectContainmentEList<IAxis>(IAxis.class, this, NattableaxisproviderPackage.AXIS_PROVIDER__AXIS);

 		}

 		return axis;

@@ -88,14 +84,13 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-			return ((InternalEList<?>)getAxis()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

+				return ((InternalEList<?>)getAxis()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -103,14 +98,13 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-			return getAxis();

+		switch (featureID) {

+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

+				return getAxis();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -118,17 +112,16 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-			getAxis().clear();

-			getAxis().addAll((Collection<? extends IAxis>)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

+				getAxis().clear();

+				getAxis().addAll((Collection<? extends IAxis>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -136,15 +129,14 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-			getAxis().clear();

-			return;

+		switch (featureID) {

+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

+				getAxis().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -152,14 +144,13 @@ public abstract class AxisProviderImpl extends AbstractAxisProviderImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

-			return axis != null && !axis.isEmpty();

+		switch (featureID) {

+			case NattableaxisproviderPackage.AXIS_PROVIDER__AXIS:

+				return axis != null && !axis.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
index f8ce9d1aaca..1fe6376ca93 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
@@ -24,11 +24,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Na
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl#isDisconnectSlave <em>

- * Disconnect Slave</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.MasterObjectAxisProviderImpl#isDisconnectSlave <em>Disconnect Slave</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -38,7 +37,6 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
 	 * The default value of the '{@link #isDisconnectSlave() <em>Disconnect Slave</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisconnectSlave()

 	 * @generated

 	 * @ordered

@@ -49,7 +47,6 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
 	 * The cached value of the '{@link #isDisconnectSlave() <em>Disconnect Slave</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisconnectSlave()

 	 * @generated

 	 * @ordered

@@ -59,7 +56,6 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected MasterObjectAxisProviderImpl() {

@@ -69,7 +65,6 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -80,7 +75,6 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -91,29 +85,26 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDisconnectSlave(boolean newDisconnectSlave) {

 		boolean oldDisconnectSlave = disconnectSlave;

 		disconnectSlave = newDisconnectSlave;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE, oldDisconnectSlave, disconnectSlave));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-			return isDisconnectSlave();

+		switch (featureID) {

+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

+				return isDisconnectSlave();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -121,15 +112,14 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-			setDisconnectSlave((Boolean)newValue);

-			return;

+		switch (featureID) {

+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

+				setDisconnectSlave((Boolean)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -137,15 +127,14 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-			setDisconnectSlave(DISCONNECT_SLAVE_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

+				setDisconnectSlave(DISCONNECT_SLAVE_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -153,14 +142,13 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

-			return disconnectSlave != DISCONNECT_SLAVE_EDEFAULT;

+		switch (featureID) {

+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER__DISCONNECT_SLAVE:

+				return disconnectSlave != DISCONNECT_SLAVE_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -168,14 +156,12 @@ public class MasterObjectAxisProviderImpl extends AxisProviderImpl implements Ma
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (disconnectSlave: "); //$NON-NLS-1$

 		result.append(disconnectSlave);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
index 2b713364c7d..d142e95558b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
@@ -26,7 +26,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Sl
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements NattableaxisproviderFactory {

@@ -35,16 +34,16 @@ public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements Nat
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static NattableaxisproviderFactory init() {

 		try {

 			NattableaxisproviderFactory theNattableaxisproviderFactory = (NattableaxisproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisproviderPackage.eNS_URI);

-			if(theNattableaxisproviderFactory != null) {

+			if (theNattableaxisproviderFactory != null) {

 				return theNattableaxisproviderFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new NattableaxisproviderFactoryImpl();

@@ -54,7 +53,6 @@ public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements Nat
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableaxisproviderFactoryImpl() {

@@ -64,25 +62,21 @@ public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

-		case NattableaxisproviderPackage.SLAVE_OBJECT_AXIS_PROVIDER:

-			return createSlaveObjectAxisProvider();

-		case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER:

-			return createMasterObjectAxisProvider();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eClass.getClassifierID()) {

+			case NattableaxisproviderPackage.SLAVE_OBJECT_AXIS_PROVIDER: return createSlaveObjectAxisProvider();

+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER: return createMasterObjectAxisProvider();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -94,7 +88,6 @@ public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -106,7 +99,6 @@ public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -117,7 +109,6 @@ public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
index b680fe8fb8d..d249420aabb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
@@ -50,7 +50,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattableaxisproviderPackageImpl extends EPackageImpl implements NattableaxisproviderPackage {

@@ -58,7 +57,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass abstractAxisProviderEClass = null;

@@ -66,7 +64,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass iMasterAxisProviderEClass = null;

@@ -74,7 +71,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass iSlaveAxisProviderEClass = null;

@@ -82,7 +78,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass axisProviderEClass = null;

@@ -90,7 +85,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass slaveObjectAxisProviderEClass = null;

@@ -98,19 +92,19 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass masterObjectAxisProviderEClass = null;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

 	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#eNS_URI

 	 * @see #init()

@@ -123,32 +117,32 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link NattableaxisproviderPackage#eINSTANCE} when that field is accessed. Clients should not invoke it

-	 * directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * 

+	 * <p>This method is used to initialize {@link NattableaxisproviderPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static NattableaxisproviderPackage init() {

-		if(isInited) {

-			return (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);

-		}

+		if (isInited) return (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);

+

 		// Obtain or create and register package

 		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisproviderPackageImpl());

+

 		isInited = true;

+

 		// Initialize simple dependencies

 		EcorePackage.eINSTANCE.eClass();

+

 		// Obtain or create and register interdependencies

 		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

 		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

@@ -159,6 +153,7 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

 		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

 		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

+

 		// Create package meta-data objects

 		theNattableaxisproviderPackage.createPackageContents();

 		theNattablePackage.createPackageContents();

@@ -170,6 +165,7 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 		theNattablecellPackage.createPackageContents();

 		theNattableproblemPackage.createPackageContents();

 		theNattablestylePackage.createPackageContents();

+

 		// Initialize created meta-data

 		theNattableaxisproviderPackage.initializePackageContents();

 		theNattablePackage.initializePackageContents();

@@ -181,8 +177,11 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 		theNattablecellPackage.initializePackageContents();

 		theNattableproblemPackage.initializePackageContents();

 		theNattablestylePackage.initializePackageContents();

+

 		// Mark meta-data to indicate it can't be changed

 		theNattableaxisproviderPackage.freeze();

+

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(NattableaxisproviderPackage.eNS_URI, theNattableaxisproviderPackage);

 		return theNattableaxisproviderPackage;

@@ -191,7 +190,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -202,7 +200,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -213,7 +210,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -224,7 +220,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -235,7 +230,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -246,7 +240,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -257,7 +250,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -268,7 +260,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -279,7 +270,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -290,7 +280,6 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -301,66 +290,69 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package. This method is

+	 * Creates the meta-model objects for the package.  This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated) {

-			return;

-		}

+		if (isCreated) return;

 		isCreated = true;

+

 		// Create classes and their features

 		abstractAxisProviderEClass = createEClass(ABSTRACT_AXIS_PROVIDER);

 		createEOperation(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER___GET_AXIS);

+

 		iMasterAxisProviderEClass = createEClass(IMASTER_AXIS_PROVIDER);

 		createEAttribute(iMasterAxisProviderEClass, IMASTER_AXIS_PROVIDER__DISCONNECT_SLAVE);

+

 		iSlaveAxisProviderEClass = createEClass(ISLAVE_AXIS_PROVIDER);

+

 		axisProviderEClass = createEClass(AXIS_PROVIDER);

 		createEReference(axisProviderEClass, AXIS_PROVIDER__AXIS);

+

 		slaveObjectAxisProviderEClass = createEClass(SLAVE_OBJECT_AXIS_PROVIDER);

+

 		masterObjectAxisProviderEClass = createEClass(MASTER_OBJECT_AXIS_PROVIDER);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model. This

+	 * Complete the initialization of the package and its meta-model.  This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized) {

-			return;

-		}

+		if (isInitialized) return;

 		isInitialized = true;

+

 		// Initialize package

 		setName(eNAME);

 		setNsPrefix(eNS_PREFIX);

 		setNsURI(eNS_URI);

+

 		// Obtain other dependent packages

 		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

 		NattableaxisPackage theNattableaxisPackage = (NattableaxisPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI);

+

 		// Create type parameters

+

 		// Set bounds for type parameters

+

 		// Add supertypes to classes

 		abstractAxisProviderEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());

 		iMasterAxisProviderEClass.getESuperTypes().add(this.getAxisProvider());

@@ -368,15 +360,22 @@ public class NattableaxisproviderPackageImpl extends EPackageImpl implements Nat
 		axisProviderEClass.getESuperTypes().add(this.getAbstractAxisProvider());

 		slaveObjectAxisProviderEClass.getESuperTypes().add(this.getISlaveAxisProvider());

 		masterObjectAxisProviderEClass.getESuperTypes().add(this.getIMasterAxisProvider());

+

 		// Initialize classes, features, and operations; add parameters

 		initEClass(abstractAxisProviderEClass, AbstractAxisProvider.class, "AbstractAxisProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEOperation(getAbstractAxisProvider__GetAxis(), theNattableaxisPackage.getIAxis(), "getAxis", 0, -1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(iMasterAxisProviderEClass, IMasterAxisProvider.class, "IMasterAxisProvider", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getIMasterAxisProvider_DisconnectSlave(), ecorePackage.getEBoolean(), "disconnectSlave", null, 0, 1, IMasterAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(iSlaveAxisProviderEClass, ISlaveAxisProvider.class, "ISlaveAxisProvider", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(axisProviderEClass, AxisProvider.class, "AxisProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getAxisProvider_Axis(), theNattableaxisPackage.getIAxis(), null, "axis", null, 0, -1, AxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(slaveObjectAxisProviderEClass, SlaveObjectAxisProvider.class, "SlaveObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(masterObjectAxisProviderEClass, MasterObjectAxisProvider.class, "MasterObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 	}

 } // NattableaxisproviderPackageImpl

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
index 87359748495..145444dbf7a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
@@ -20,8 +20,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.Sl
  * <!-- begin-user-doc -->

  * An implementation of the model object '<em><b>Slave Object Axis Provider</b></em>'.

  * <!-- end-user-doc -->

- * <p>

- * </p>

  *

  * @generated

  */

@@ -30,7 +28,6 @@ public class SlaveObjectAxisProviderImpl extends AxisProviderImpl implements Sla
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected SlaveObjectAxisProviderImpl() {

@@ -40,7 +37,6 @@ public class SlaveObjectAxisProviderImpl extends AxisProviderImpl implements Sla
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
index 43cd3a9279a..4bd0306cd2e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
@@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage

  * @generated

  */

@@ -42,7 +41,6 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattableaxisproviderPackage modelPackage;

@@ -51,11 +49,10 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableaxisproviderAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattableaxisproviderPackage.eINSTANCE;

 		}

 	}

@@ -65,16 +62,15 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

+		if (object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

@@ -84,69 +80,56 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NattableaxisproviderSwitch<Adapter> modelSwitch = new NattableaxisproviderSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseAbstractAxisProvider(AbstractAxisProvider object) {

-			return createAbstractAxisProviderAdapter();

-		}

-

-		@Override

-		public Adapter caseIMasterAxisProvider(IMasterAxisProvider object) {

-			return createIMasterAxisProviderAdapter();

-		}

-

-		@Override

-		public Adapter caseISlaveAxisProvider(ISlaveAxisProvider object) {

-			return createISlaveAxisProviderAdapter();

-		}

-

-		@Override

-		public Adapter caseAxisProvider(AxisProvider object) {

-			return createAxisProviderAdapter();

-		}

-

-		@Override

-		public Adapter caseSlaveObjectAxisProvider(SlaveObjectAxisProvider object) {

-			return createSlaveObjectAxisProviderAdapter();

-		}

-

-		@Override

-		public Adapter caseMasterObjectAxisProvider(MasterObjectAxisProvider object) {

-			return createMasterObjectAxisProviderAdapter();

-		}

-

-		@Override

-		public Adapter caseEModelElement(EModelElement object) {

-			return createEModelElementAdapter();

-		}

-

-		@Override

-		public Adapter caseStyledElement(StyledElement object) {

-			return createStyledElementAdapter();

-		}

-

-		@Override

-		public Adapter caseTableNamedElement(TableNamedElement object) {

-			return createTableNamedElementAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

+			@Override

+			public Adapter caseAbstractAxisProvider(AbstractAxisProvider object) {

+				return createAbstractAxisProviderAdapter();

+			}

+			@Override

+			public Adapter caseIMasterAxisProvider(IMasterAxisProvider object) {

+				return createIMasterAxisProviderAdapter();

+			}

+			@Override

+			public Adapter caseISlaveAxisProvider(ISlaveAxisProvider object) {

+				return createISlaveAxisProviderAdapter();

+			}

+			@Override

+			public Adapter caseAxisProvider(AxisProvider object) {

+				return createAxisProviderAdapter();

+			}

+			@Override

+			public Adapter caseSlaveObjectAxisProvider(SlaveObjectAxisProvider object) {

+				return createSlaveObjectAxisProviderAdapter();

+			}

+			@Override

+			public Adapter caseMasterObjectAxisProvider(MasterObjectAxisProvider object) {

+				return createMasterObjectAxisProviderAdapter();

+			}

+			@Override

+			public Adapter caseEModelElement(EModelElement object) {

+				return createEModelElementAdapter();

+			}

+			@Override

+			public Adapter caseStyledElement(StyledElement object) {

+				return createStyledElementAdapter();

+			}

+			@Override

+			public Adapter caseTableNamedElement(TableNamedElement object) {

+				return createTableNamedElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *        the object to adapt.

+	 * @param target the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -156,13 +139,11 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider

 	 * @generated

@@ -172,13 +153,11 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider <em>IMaster Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider

 	 * @generated

@@ -188,13 +167,11 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

-	 * <em>ISlave Axis Provider</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider <em>ISlave Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider

 	 * @generated

@@ -204,13 +181,11 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider

-	 * <em>Axis Provider</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider <em>Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisProvider

 	 * @generated

@@ -220,13 +195,11 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider <em>Slave Object Axis Provider</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider <em>Slave Object Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.SlaveObjectAxisProvider

 	 * @generated

@@ -236,13 +209,11 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider <em>Master Object Axis Provider</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider <em>Master Object Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.MasterObjectAxisProvider

 	 * @generated

@@ -257,7 +228,6 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.ecore.EModelElement

 	 * @generated

@@ -267,13 +237,11 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * <em>Styled Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

 	 * @generated

@@ -283,13 +251,11 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

-	 * <em>Table Named Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

 	 * @generated

@@ -303,7 +269,6 @@ public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
index 90e08be17fd..94a27d03a3b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
@@ -35,7 +35,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage

  * @generated

  */

@@ -45,7 +44,6 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattableaxisproviderPackage modelPackage;

@@ -54,11 +52,10 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableaxisproviderSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattableaxisproviderPackage.eINSTANCE;

 		}

 	}

@@ -67,8 +64,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

+	 * @param ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

 	 */

@@ -81,156 +77,78 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER:

-		{

-			AbstractAxisProvider abstractAxisProvider = (AbstractAxisProvider)theEObject;

-			T result = caseAbstractAxisProvider(abstractAxisProvider);

-			if(result == null) {

-				result = caseTableNamedElement(abstractAxisProvider);

-			}

-			if(result == null) {

-				result = caseStyledElement(abstractAxisProvider);

-			}

-			if(result == null) {

-				result = caseEModelElement(abstractAxisProvider);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisproviderPackage.IMASTER_AXIS_PROVIDER:

-		{

-			IMasterAxisProvider iMasterAxisProvider = (IMasterAxisProvider)theEObject;

-			T result = caseIMasterAxisProvider(iMasterAxisProvider);

-			if(result == null) {

-				result = caseAxisProvider(iMasterAxisProvider);

-			}

-			if(result == null) {

-				result = caseAbstractAxisProvider(iMasterAxisProvider);

-			}

-			if(result == null) {

-				result = caseTableNamedElement(iMasterAxisProvider);

-			}

-			if(result == null) {

-				result = caseStyledElement(iMasterAxisProvider);

-			}

-			if(result == null) {

-				result = caseEModelElement(iMasterAxisProvider);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisproviderPackage.ISLAVE_AXIS_PROVIDER:

-		{

-			ISlaveAxisProvider iSlaveAxisProvider = (ISlaveAxisProvider)theEObject;

-			T result = caseISlaveAxisProvider(iSlaveAxisProvider);

-			if(result == null) {

-				result = caseAxisProvider(iSlaveAxisProvider);

-			}

-			if(result == null) {

-				result = caseAbstractAxisProvider(iSlaveAxisProvider);

-			}

-			if(result == null) {

-				result = caseTableNamedElement(iSlaveAxisProvider);

-			}

-			if(result == null) {

-				result = caseStyledElement(iSlaveAxisProvider);

-			}

-			if(result == null) {

-				result = caseEModelElement(iSlaveAxisProvider);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisproviderPackage.AXIS_PROVIDER:

-		{

-			AxisProvider axisProvider = (AxisProvider)theEObject;

-			T result = caseAxisProvider(axisProvider);

-			if(result == null) {

-				result = caseAbstractAxisProvider(axisProvider);

-			}

-			if(result == null) {

-				result = caseTableNamedElement(axisProvider);

-			}

-			if(result == null) {

-				result = caseStyledElement(axisProvider);

-			}

-			if(result == null) {

-				result = caseEModelElement(axisProvider);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisproviderPackage.SLAVE_OBJECT_AXIS_PROVIDER:

-		{

-			SlaveObjectAxisProvider slaveObjectAxisProvider = (SlaveObjectAxisProvider)theEObject;

-			T result = caseSlaveObjectAxisProvider(slaveObjectAxisProvider);

-			if(result == null) {

-				result = caseISlaveAxisProvider(slaveObjectAxisProvider);

-			}

-			if(result == null) {

-				result = caseAxisProvider(slaveObjectAxisProvider);

-			}

-			if(result == null) {

-				result = caseAbstractAxisProvider(slaveObjectAxisProvider);

-			}

-			if(result == null) {

-				result = caseTableNamedElement(slaveObjectAxisProvider);

-			}

-			if(result == null) {

-				result = caseStyledElement(slaveObjectAxisProvider);

-			}

-			if(result == null) {

-				result = caseEModelElement(slaveObjectAxisProvider);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER:

-		{

-			MasterObjectAxisProvider masterObjectAxisProvider = (MasterObjectAxisProvider)theEObject;

-			T result = caseMasterObjectAxisProvider(masterObjectAxisProvider);

-			if(result == null) {

-				result = caseIMasterAxisProvider(masterObjectAxisProvider);

-			}

-			if(result == null) {

-				result = caseAxisProvider(masterObjectAxisProvider);

-			}

-			if(result == null) {

-				result = caseAbstractAxisProvider(masterObjectAxisProvider);

-			}

-			if(result == null) {

-				result = caseTableNamedElement(masterObjectAxisProvider);

-			}

-			if(result == null) {

-				result = caseStyledElement(masterObjectAxisProvider);

-			}

-			if(result == null) {

-				result = caseEModelElement(masterObjectAxisProvider);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+		switch (classifierID) {

+			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER: {

+				AbstractAxisProvider abstractAxisProvider = (AbstractAxisProvider)theEObject;

+				T result = caseAbstractAxisProvider(abstractAxisProvider);

+				if (result == null) result = caseTableNamedElement(abstractAxisProvider);

+				if (result == null) result = caseStyledElement(abstractAxisProvider);

+				if (result == null) result = caseEModelElement(abstractAxisProvider);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisproviderPackage.IMASTER_AXIS_PROVIDER: {

+				IMasterAxisProvider iMasterAxisProvider = (IMasterAxisProvider)theEObject;

+				T result = caseIMasterAxisProvider(iMasterAxisProvider);

+				if (result == null) result = caseAxisProvider(iMasterAxisProvider);

+				if (result == null) result = caseAbstractAxisProvider(iMasterAxisProvider);

+				if (result == null) result = caseTableNamedElement(iMasterAxisProvider);

+				if (result == null) result = caseStyledElement(iMasterAxisProvider);

+				if (result == null) result = caseEModelElement(iMasterAxisProvider);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisproviderPackage.ISLAVE_AXIS_PROVIDER: {

+				ISlaveAxisProvider iSlaveAxisProvider = (ISlaveAxisProvider)theEObject;

+				T result = caseISlaveAxisProvider(iSlaveAxisProvider);

+				if (result == null) result = caseAxisProvider(iSlaveAxisProvider);

+				if (result == null) result = caseAbstractAxisProvider(iSlaveAxisProvider);

+				if (result == null) result = caseTableNamedElement(iSlaveAxisProvider);

+				if (result == null) result = caseStyledElement(iSlaveAxisProvider);

+				if (result == null) result = caseEModelElement(iSlaveAxisProvider);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisproviderPackage.AXIS_PROVIDER: {

+				AxisProvider axisProvider = (AxisProvider)theEObject;

+				T result = caseAxisProvider(axisProvider);

+				if (result == null) result = caseAbstractAxisProvider(axisProvider);

+				if (result == null) result = caseTableNamedElement(axisProvider);

+				if (result == null) result = caseStyledElement(axisProvider);

+				if (result == null) result = caseEModelElement(axisProvider);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisproviderPackage.SLAVE_OBJECT_AXIS_PROVIDER: {

+				SlaveObjectAxisProvider slaveObjectAxisProvider = (SlaveObjectAxisProvider)theEObject;

+				T result = caseSlaveObjectAxisProvider(slaveObjectAxisProvider);

+				if (result == null) result = caseISlaveAxisProvider(slaveObjectAxisProvider);

+				if (result == null) result = caseAxisProvider(slaveObjectAxisProvider);

+				if (result == null) result = caseAbstractAxisProvider(slaveObjectAxisProvider);

+				if (result == null) result = caseTableNamedElement(slaveObjectAxisProvider);

+				if (result == null) result = caseStyledElement(slaveObjectAxisProvider);

+				if (result == null) result = caseEModelElement(slaveObjectAxisProvider);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableaxisproviderPackage.MASTER_OBJECT_AXIS_PROVIDER: {

+				MasterObjectAxisProvider masterObjectAxisProvider = (MasterObjectAxisProvider)theEObject;

+				T result = caseMasterObjectAxisProvider(masterObjectAxisProvider);

+				if (result == null) result = caseIMasterAxisProvider(masterObjectAxisProvider);

+				if (result == null) result = caseAxisProvider(masterObjectAxisProvider);

+				if (result == null) result = caseAbstractAxisProvider(masterObjectAxisProvider);

+				if (result == null) result = caseTableNamedElement(masterObjectAxisProvider);

+				if (result == null) result = caseStyledElement(masterObjectAxisProvider);

+				if (result == null) result = caseEModelElement(masterObjectAxisProvider);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -240,9 +158,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -257,9 +173,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>IMaster Axis Provider</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -274,9 +188,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>ISlave Axis Provider</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -291,9 +203,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Axis Provider</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -308,9 +218,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Slave Object Axis Provider</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -325,9 +233,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Master Object Axis Provider</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -342,9 +248,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -359,9 +263,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -376,9 +278,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -393,9 +293,7 @@ public class NattableaxisproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java
index a2d5d14f8a2..0c066e5d95c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/Cell.java
@@ -27,12 +27,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems <em>Problems</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems <em>Problems</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell()

  * @model

@@ -47,7 +47,6 @@ public interface Cell extends EModelElement {
 	 * <!-- begin-model-doc -->

 	 * The column element on which this cell must be displayed.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Column Wrapper</em>' containment reference.

 	 * @see #setColumnWrapper(ICellAxisWrapper)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell_ColumnWrapper()

@@ -57,13 +56,10 @@ public interface Cell extends EModelElement {
 	ICellAxisWrapper getColumnWrapper();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}'

-	 * containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Column Wrapper</em>' containment reference.

+	 * @param value the new value of the '<em>Column Wrapper</em>' containment reference.

 	 * @see #getColumnWrapper()

 	 * @generated

 	 */

@@ -76,7 +72,6 @@ public interface Cell extends EModelElement {
 	 * <!-- begin-model-doc -->

 	 * The row element on which this cell must be displayed.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Row Wrapper</em>' containment reference.

 	 * @see #setRowWrapper(ICellAxisWrapper)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell_RowWrapper()

@@ -86,13 +81,10 @@ public interface Cell extends EModelElement {
 	ICellAxisWrapper getRowWrapper();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}'

-	 * containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Row Wrapper</em>' containment reference.

+	 * @param value the new value of the '<em>Row Wrapper</em>' containment reference.

 	 * @see #getRowWrapper()

 	 * @generated

 	 */

@@ -106,7 +98,6 @@ public interface Cell extends EModelElement {
 	 * <!-- begin-model-doc -->

 	 * a list of problem founds on this cell

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Problems</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getCell_Problems()

 	 * @model containment="true"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java
index ceed495b391..cd3741299e6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/EObjectAxisWrapper.java
@@ -25,10 +25,10 @@ import org.eclipse.emf.ecore.EObject;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getEObjectAxisWrapper()

  * @model

@@ -43,7 +43,6 @@ public interface EObjectAxisWrapper extends ICellAxisWrapper {
 	 * <!-- begin-model-doc -->

 	 * The wrapped element

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Element</em>' reference.

 	 * @see #setElement(EObject)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getEObjectAxisWrapper_Element()

@@ -54,13 +53,10 @@ public interface EObjectAxisWrapper extends ICellAxisWrapper {
 	EObject getElement();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}'

-	 * reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement <em>Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Element</em>' reference.

+	 * @param value the new value of the '<em>Element</em>' reference.

 	 * @see #getElement()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java
index 82fbecbdda4..1f60314f919 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/ICellAxisWrapper.java
@@ -36,7 +36,6 @@ public interface ICellAxisWrapper extends EModelElement {
 	 * <!-- begin-model-doc -->

 	 * Return the wrapped object

 	 * <!-- end-model-doc -->

-	 *

 	 * @model kind="operation" required="true"

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java
index 9df6471ee31..b8a744a9fde 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/IdAxisWrapper.java
@@ -23,10 +23,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getIdAxisWrapper()

  * @model

@@ -41,7 +41,6 @@ public interface IdAxisWrapper extends ICellAxisWrapper {
 	 * <!-- begin-model-doc -->

 	 * The id used to identifies an element.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Element</em>' attribute.

 	 * @see #setElement(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#getIdAxisWrapper_Element()

@@ -52,13 +51,10 @@ public interface IdAxisWrapper extends ICellAxisWrapper {
 	String getElement();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Element</em>' attribute.

+	 * @param value the new value of the '<em>Element</em>' attribute.

 	 * @see #getElement()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java
index 5152ce60fde..00afcaf70b3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage

  * @generated

  */

@@ -29,7 +28,6 @@ public interface NattablecellFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattablecellFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellFactoryImpl.init();

@@ -38,7 +36,6 @@ public interface NattablecellFactory extends EFactory {
 	 * Returns a new object of class '<em>Cell</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Cell</em>'.

 	 * @generated

 	 */

@@ -48,7 +45,6 @@ public interface NattablecellFactory extends EFactory {
 	 * Returns a new object of class '<em>EObject Axis Wrapper</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>EObject Axis Wrapper</em>'.

 	 * @generated

 	 */

@@ -58,7 +54,6 @@ public interface NattablecellFactory extends EFactory {
 	 * Returns a new object of class '<em>Id Axis Wrapper</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Id Axis Wrapper</em>'.

 	 * @generated

 	 */

@@ -68,7 +63,6 @@ public interface NattablecellFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java
index 6ff9bf51bc2..d11400c10f9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/NattablecellPackage.java
@@ -31,7 +31,6 @@ import org.eclipse.emf.ecore.EcorePackage;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellFactory

  * @model kind="package"

  * @generated

@@ -42,7 +41,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNAME = "nattablecell"; //$NON-NLS-1$

@@ -51,7 +49,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablecell"; //$NON-NLS-1$

@@ -60,7 +57,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "nattablecell"; //$NON-NLS-1$

@@ -69,7 +65,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattablecellPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl.init();

@@ -78,7 +73,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl <em>Cell</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getCell()

 	 * @generated

@@ -89,7 +83,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -99,7 +92,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The feature id for the '<em><b>Column Wrapper</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -109,7 +101,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The feature id for the '<em><b>Row Wrapper</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -119,7 +110,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The feature id for the '<em><b>Problems</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -129,7 +119,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The number of structural features of the '<em>Cell</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -139,7 +128,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -149,18 +137,15 @@ public interface NattablecellPackage extends EPackage {
 	 * The number of operations of the '<em>Cell</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int CELL_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}

-	 * ' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getICellAxisWrapper()

 	 * @generated

@@ -171,7 +156,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -181,7 +165,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The number of structural features of the '<em>ICell Axis Wrapper</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -191,7 +174,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -201,7 +183,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -211,18 +192,15 @@ public interface NattablecellPackage extends EPackage {
 	 * The number of operations of the '<em>ICell Axis Wrapper</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int ICELL_AXIS_WRAPPER_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl

-	 * <em>EObject Axis Wrapper</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl <em>EObject Axis Wrapper</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getEObjectAxisWrapper()

 	 * @generated

@@ -233,7 +211,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -243,7 +220,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -253,7 +229,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The number of structural features of the '<em>EObject Axis Wrapper</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -263,7 +238,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -273,7 +247,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -283,18 +256,15 @@ public interface NattablecellPackage extends EPackage {
 	 * The number of operations of the '<em>EObject Axis Wrapper</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int EOBJECT_AXIS_WRAPPER_OPERATION_COUNT = ICELL_AXIS_WRAPPER_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl

-	 * <em>Id Axis Wrapper</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl <em>Id Axis Wrapper</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getIdAxisWrapper()

 	 * @generated

@@ -305,7 +275,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -315,7 +284,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The feature id for the '<em><b>Element</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -325,7 +293,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The number of structural features of the '<em>Id Axis Wrapper</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -335,7 +302,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -345,7 +311,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The operation id for the '<em>Get Element</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -355,7 +320,6 @@ public interface NattablecellPackage extends EPackage {
 	 * The number of operations of the '<em>Id Axis Wrapper</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -365,7 +329,6 @@ public interface NattablecellPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell <em>Cell</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Cell</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell

 	 * @generated

@@ -373,11 +336,9 @@ public interface NattablecellPackage extends EPackage {
 	EClass getCell();

 

 	/**

-	 * Returns the meta object for the containment reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper <em>Column Wrapper</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference '<em>Column Wrapper</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getColumnWrapper()

 	 * @see #getCell()

@@ -386,11 +347,9 @@ public interface NattablecellPackage extends EPackage {
 	EReference getCell_ColumnWrapper();

 

 	/**

-	 * Returns the meta object for the containment reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper <em>Row Wrapper</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference '<em>Row Wrapper</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getRowWrapper()

 	 * @see #getCell()

@@ -399,11 +358,9 @@ public interface NattablecellPackage extends EPackage {
 	EReference getCell_RowWrapper();

 

 	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems <em>Problems</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems <em>Problems</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Problems</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell#getProblems()

 	 * @see #getCell()

@@ -412,11 +369,9 @@ public interface NattablecellPackage extends EPackage {
 	EReference getCell_Problems();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper

-	 * <em>ICell Axis Wrapper</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>ICell Axis Wrapper</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper

 	 * @generated

@@ -424,11 +379,9 @@ public interface NattablecellPackage extends EPackage {
 	EClass getICellAxisWrapper();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper#getElement()

-	 * <em>Get Element</em>}' operation.

+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper#getElement() <em>Get Element</em>}' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the '<em>Get Element</em>' operation.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper#getElement()

 	 * @generated

@@ -436,11 +389,9 @@ public interface NattablecellPackage extends EPackage {
 	EOperation getICellAxisWrapper__GetElement();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper

-	 * <em>EObject Axis Wrapper</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper <em>EObject Axis Wrapper</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>EObject Axis Wrapper</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper

 	 * @generated

@@ -448,11 +399,9 @@ public interface NattablecellPackage extends EPackage {
 	EClass getEObjectAxisWrapper();

 

 	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#getElement

-	 * <em>Element</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper#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.nattablecell.EObjectAxisWrapper#getElement()

 	 * @see #getEObjectAxisWrapper()

@@ -461,11 +410,9 @@ public interface NattablecellPackage extends EPackage {
 	EReference getEObjectAxisWrapper_Element();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper

-	 * <em>Id Axis Wrapper</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper <em>Id Axis Wrapper</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Id Axis Wrapper</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper

 	 * @generated

@@ -473,11 +420,9 @@ public interface NattablecellPackage extends EPackage {
 	EClass getIdAxisWrapper();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement

-	 * <em>Element</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement <em>Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Element</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper#getElement()

 	 * @see #getIdAxisWrapper()

@@ -489,7 +434,6 @@ public interface NattablecellPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -506,7 +450,6 @@ public interface NattablecellPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -515,7 +458,6 @@ public interface NattablecellPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl <em>Cell</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getCell()

 		 * @generated

@@ -526,7 +468,6 @@ public interface NattablecellPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Column Wrapper</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference CELL__COLUMN_WRAPPER = eINSTANCE.getCell_ColumnWrapper();

@@ -535,7 +476,6 @@ public interface NattablecellPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Row Wrapper</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference CELL__ROW_WRAPPER = eINSTANCE.getCell_RowWrapper();

@@ -544,17 +484,14 @@ public interface NattablecellPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Problems</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference CELL__PROBLEMS = eINSTANCE.getCell_Problems();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper

-		 * <em>ICell Axis Wrapper</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getICellAxisWrapper()

 		 * @generated

@@ -565,17 +502,14 @@ public interface NattablecellPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Get Element</b></em>' operation.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EOperation ICELL_AXIS_WRAPPER___GET_ELEMENT = eINSTANCE.getICellAxisWrapper__GetElement();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl

-		 * <em>EObject Axis Wrapper</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl <em>EObject Axis Wrapper</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getEObjectAxisWrapper()

 		 * @generated

@@ -586,17 +520,14 @@ public interface NattablecellPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference EOBJECT_AXIS_WRAPPER__ELEMENT = eINSTANCE.getEObjectAxisWrapper_Element();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl

-		 * <em>Id Axis Wrapper</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl <em>Id Axis Wrapper</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.NattablecellPackageImpl#getIdAxisWrapper()

 		 * @generated

@@ -607,7 +538,6 @@ public interface NattablecellPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Element</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute ID_AXIS_WRAPPER__ELEMENT = eINSTANCE.getIdAxisWrapper_Element();

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java
index 8180dd63749..c2f3dfa720f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/CellImpl.java
@@ -34,12 +34,12 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getColumnWrapper <em>Column Wrapper</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getRowWrapper <em>Row Wrapper</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getProblems <em>Problems</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getColumnWrapper <em>Column Wrapper</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getRowWrapper <em>Row Wrapper</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.CellImpl#getProblems <em>Problems</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -49,7 +49,6 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	 * The cached value of the '{@link #getColumnWrapper() <em>Column Wrapper</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getColumnWrapper()

 	 * @generated

 	 * @ordered

@@ -60,7 +59,6 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	 * The cached value of the '{@link #getRowWrapper() <em>Row Wrapper</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getRowWrapper()

 	 * @generated

 	 * @ordered

@@ -71,7 +69,6 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	 * The cached value of the '{@link #getProblems() <em>Problems</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getProblems()

 	 * @generated

 	 * @ordered

@@ -81,7 +78,6 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected CellImpl() {

@@ -91,7 +87,6 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -102,7 +97,6 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -113,19 +107,14 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetColumnWrapper(ICellAxisWrapper newColumnWrapper, NotificationChain msgs) {

 		ICellAxisWrapper oldColumnWrapper = columnWrapper;

 		columnWrapper = newColumnWrapper;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__COLUMN_WRAPPER, oldColumnWrapper, newColumnWrapper);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -133,32 +122,26 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setColumnWrapper(ICellAxisWrapper newColumnWrapper) {

-		if(newColumnWrapper != columnWrapper) {

+		if (newColumnWrapper != columnWrapper) {

 			NotificationChain msgs = null;

-			if(columnWrapper != null) {

+			if (columnWrapper != null)

 				msgs = ((InternalEObject)columnWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);

-			}

-			if(newColumnWrapper != null) {

+			if (newColumnWrapper != null)

 				msgs = ((InternalEObject)newColumnWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__COLUMN_WRAPPER, null, msgs);

-			}

 			msgs = basicSetColumnWrapper(newColumnWrapper, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__COLUMN_WRAPPER, newColumnWrapper, newColumnWrapper));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__COLUMN_WRAPPER, newColumnWrapper, newColumnWrapper));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -169,19 +152,14 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetRowWrapper(ICellAxisWrapper newRowWrapper, NotificationChain msgs) {

 		ICellAxisWrapper oldRowWrapper = rowWrapper;

 		rowWrapper = newRowWrapper;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__ROW_WRAPPER, oldRowWrapper, newRowWrapper);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -189,37 +167,31 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setRowWrapper(ICellAxisWrapper newRowWrapper) {

-		if(newRowWrapper != rowWrapper) {

+		if (newRowWrapper != rowWrapper) {

 			NotificationChain msgs = null;

-			if(rowWrapper != null) {

+			if (rowWrapper != null)

 				msgs = ((InternalEObject)rowWrapper).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);

-			}

-			if(newRowWrapper != null) {

+			if (newRowWrapper != null)

 				msgs = ((InternalEObject)newRowWrapper).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablecellPackage.CELL__ROW_WRAPPER, null, msgs);

-			}

 			msgs = basicSetRowWrapper(newRowWrapper, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__ROW_WRAPPER, newRowWrapper, newRowWrapper));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.CELL__ROW_WRAPPER, newRowWrapper, newRowWrapper));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<Problem> getProblems() {

-		if(problems == null) {

+		if (problems == null) {

 			problems = new EObjectContainmentEList<Problem>(Problem.class, this, NattablecellPackage.CELL__PROBLEMS);

 		}

 		return problems;

@@ -228,18 +200,17 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattablecellPackage.CELL__COLUMN_WRAPPER:

-			return basicSetColumnWrapper(null, msgs);

-		case NattablecellPackage.CELL__ROW_WRAPPER:

-			return basicSetRowWrapper(null, msgs);

-		case NattablecellPackage.CELL__PROBLEMS:

-			return ((InternalEList<?>)getProblems()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattablecellPackage.CELL__COLUMN_WRAPPER:

+				return basicSetColumnWrapper(null, msgs);

+			case NattablecellPackage.CELL__ROW_WRAPPER:

+				return basicSetRowWrapper(null, msgs);

+			case NattablecellPackage.CELL__PROBLEMS:

+				return ((InternalEList<?>)getProblems()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -247,18 +218,17 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablecellPackage.CELL__COLUMN_WRAPPER:

-			return getColumnWrapper();

-		case NattablecellPackage.CELL__ROW_WRAPPER:

-			return getRowWrapper();

-		case NattablecellPackage.CELL__PROBLEMS:

-			return getProblems();

+		switch (featureID) {

+			case NattablecellPackage.CELL__COLUMN_WRAPPER:

+				return getColumnWrapper();

+			case NattablecellPackage.CELL__ROW_WRAPPER:

+				return getRowWrapper();

+			case NattablecellPackage.CELL__PROBLEMS:

+				return getProblems();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -266,23 +236,22 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablecellPackage.CELL__COLUMN_WRAPPER:

-			setColumnWrapper((ICellAxisWrapper)newValue);

-			return;

-		case NattablecellPackage.CELL__ROW_WRAPPER:

-			setRowWrapper((ICellAxisWrapper)newValue);

-			return;

-		case NattablecellPackage.CELL__PROBLEMS:

-			getProblems().clear();

-			getProblems().addAll((Collection<? extends Problem>)newValue);

-			return;

+		switch (featureID) {

+			case NattablecellPackage.CELL__COLUMN_WRAPPER:

+				setColumnWrapper((ICellAxisWrapper)newValue);

+				return;

+			case NattablecellPackage.CELL__ROW_WRAPPER:

+				setRowWrapper((ICellAxisWrapper)newValue);

+				return;

+			case NattablecellPackage.CELL__PROBLEMS:

+				getProblems().clear();

+				getProblems().addAll((Collection<? extends Problem>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -290,21 +259,20 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablecellPackage.CELL__COLUMN_WRAPPER:

-			setColumnWrapper((ICellAxisWrapper)null);

-			return;

-		case NattablecellPackage.CELL__ROW_WRAPPER:

-			setRowWrapper((ICellAxisWrapper)null);

-			return;

-		case NattablecellPackage.CELL__PROBLEMS:

-			getProblems().clear();

-			return;

+		switch (featureID) {

+			case NattablecellPackage.CELL__COLUMN_WRAPPER:

+				setColumnWrapper((ICellAxisWrapper)null);

+				return;

+			case NattablecellPackage.CELL__ROW_WRAPPER:

+				setRowWrapper((ICellAxisWrapper)null);

+				return;

+			case NattablecellPackage.CELL__PROBLEMS:

+				getProblems().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -312,18 +280,17 @@ public class CellImpl extends EModelElementImpl implements Cell {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablecellPackage.CELL__COLUMN_WRAPPER:

-			return columnWrapper != null;

-		case NattablecellPackage.CELL__ROW_WRAPPER:

-			return rowWrapper != null;

-		case NattablecellPackage.CELL__PROBLEMS:

-			return problems != null && !problems.isEmpty();

+		switch (featureID) {

+			case NattablecellPackage.CELL__COLUMN_WRAPPER:

+				return columnWrapper != null;

+			case NattablecellPackage.CELL__ROW_WRAPPER:

+				return rowWrapper != null;

+			case NattablecellPackage.CELL__PROBLEMS:

+				return problems != null && !problems.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java
index 8c472f28492..1b27c3e1f54 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/EObjectAxisWrapperImpl.java
@@ -27,10 +27,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Nattablece
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl#getElement <em>Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.EObjectAxisWrapperImpl#getElement <em>Element</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -40,7 +40,6 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
 	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getElement()

 	 * @generated

 	 * @ordered

@@ -50,7 +49,6 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected EObjectAxisWrapperImpl() {

@@ -60,7 +58,6 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -71,18 +68,16 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject getElement() {

-		if(element != null && element.eIsProxy()) {

+		if (element != null && element.eIsProxy()) {

 			InternalEObject oldElement = (InternalEObject)element;

 			element = eResolveProxy(oldElement);

-			if(element != oldElement) {

-				if(eNotificationRequired()) {

+			if (element != oldElement) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT, oldElement, element));

-				}

 			}

 		}

 		return element;

@@ -91,7 +86,6 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public EObject basicGetElement() {

@@ -101,32 +95,27 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setElement(EObject newElement) {

 		EObject oldElement = element;

 		element = newElement;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT, oldElement, element));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

-			if(resolve) {

-				return getElement();

-			}

-			return basicGetElement();

+		switch (featureID) {

+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

+				if (resolve) return getElement();

+				return basicGetElement();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -134,15 +123,14 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

-			setElement((EObject)newValue);

-			return;

+		switch (featureID) {

+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

+				setElement((EObject)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -150,15 +138,14 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

-			setElement((EObject)null);

-			return;

+		switch (featureID) {

+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

+				setElement((EObject)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -166,14 +153,13 @@ public class EObjectAxisWrapperImpl extends EModelElementImpl implements EObject
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

-			return element != null;

+		switch (featureID) {

+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER__ELEMENT:

+				return element != null;

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java
index 36626ea1aea..41c34f95abe 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/IdAxisWrapperImpl.java
@@ -25,10 +25,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Nattablece
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl#getElement <em>Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.impl.IdAxisWrapperImpl#getElement <em>Element</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -38,7 +38,6 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
 	 * The default value of the '{@link #getElement() <em>Element</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getElement()

 	 * @generated

 	 * @ordered

@@ -49,7 +48,6 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
 	 * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getElement()

 	 * @generated

 	 * @ordered

@@ -59,7 +57,6 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected IdAxisWrapperImpl() {

@@ -69,7 +66,6 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -80,7 +76,6 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -91,29 +86,26 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setElement(String newElement) {

 		String oldElement = element;

 		element = newElement;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT, oldElement, element));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

-			return getElement();

+		switch (featureID) {

+			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

+				return getElement();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -121,15 +113,14 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

-			setElement((String)newValue);

-			return;

+		switch (featureID) {

+			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

+				setElement((String)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -137,15 +128,14 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

-			setElement(ELEMENT_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

+				setElement(ELEMENT_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -153,14 +143,13 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

-			return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);

+		switch (featureID) {

+			case NattablecellPackage.ID_AXIS_WRAPPER__ELEMENT:

+				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -168,14 +157,12 @@ public class IdAxisWrapperImpl extends EModelElementImpl implements IdAxisWrappe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (element: "); //$NON-NLS-1$

 		result.append(element);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java
index 0480f32b2ea..f61cec7aede 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellFactoryImpl.java
@@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Nattablece
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattablecellFactoryImpl extends EFactoryImpl implements NattablecellFactory {

@@ -36,16 +35,16 @@ public class NattablecellFactoryImpl extends EFactoryImpl implements Nattablecel
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static NattablecellFactory init() {

 		try {

 			NattablecellFactory theNattablecellFactory = (NattablecellFactory)EPackage.Registry.INSTANCE.getEFactory(NattablecellPackage.eNS_URI);

-			if(theNattablecellFactory != null) {

+			if (theNattablecellFactory != null) {

 				return theNattablecellFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new NattablecellFactoryImpl();

@@ -55,7 +54,6 @@ public class NattablecellFactoryImpl extends EFactoryImpl implements Nattablecel
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattablecellFactoryImpl() {

@@ -65,27 +63,22 @@ public class NattablecellFactoryImpl extends EFactoryImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

-		case NattablecellPackage.CELL:

-			return createCell();

-		case NattablecellPackage.EOBJECT_AXIS_WRAPPER:

-			return createEObjectAxisWrapper();

-		case NattablecellPackage.ID_AXIS_WRAPPER:

-			return createIdAxisWrapper();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eClass.getClassifierID()) {

+			case NattablecellPackage.CELL: return createCell();

+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER: return createEObjectAxisWrapper();

+			case NattablecellPackage.ID_AXIS_WRAPPER: return createIdAxisWrapper();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -97,7 +90,6 @@ public class NattablecellFactoryImpl extends EFactoryImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -109,7 +101,6 @@ public class NattablecellFactoryImpl extends EFactoryImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -121,7 +112,6 @@ public class NattablecellFactoryImpl extends EFactoryImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -132,7 +122,6 @@ public class NattablecellFactoryImpl extends EFactoryImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java
index 5bfb4bf6ef1..9b162c47770 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/impl/NattablecellPackageImpl.java
@@ -48,7 +48,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattablecellPackageImpl extends EPackageImpl implements NattablecellPackage {

@@ -56,7 +55,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass cellEClass = null;

@@ -64,7 +62,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass iCellAxisWrapperEClass = null;

@@ -72,7 +69,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass eObjectAxisWrapperEClass = null;

@@ -80,19 +76,19 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass idAxisWrapperEClass = null;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

 	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage#eNS_URI

 	 * @see #init()

@@ -105,32 +101,32 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link NattablecellPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * 

+	 * <p>This method is used to initialize {@link NattablecellPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static NattablecellPackage init() {

-		if(isInited) {

-			return (NattablecellPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);

-		}

+		if (isInited) return (NattablecellPackage)EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI);

+

 		// Obtain or create and register package

 		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablecellPackageImpl());

+

 		isInited = true;

+

 		// Initialize simple dependencies

 		EcorePackage.eINSTANCE.eClass();

+

 		// Obtain or create and register interdependencies

 		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

 		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

@@ -141,6 +137,7 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);

 		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

 		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

+

 		// Create package meta-data objects

 		theNattablecellPackage.createPackageContents();

 		theNattablePackage.createPackageContents();

@@ -152,6 +149,7 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 		theNattableaxisPackage.createPackageContents();

 		theNattableproblemPackage.createPackageContents();

 		theNattablestylePackage.createPackageContents();

+

 		// Initialize created meta-data

 		theNattablecellPackage.initializePackageContents();

 		theNattablePackage.initializePackageContents();

@@ -163,8 +161,11 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 		theNattableaxisPackage.initializePackageContents();

 		theNattableproblemPackage.initializePackageContents();

 		theNattablestylePackage.initializePackageContents();

+

 		// Mark meta-data to indicate it can't be changed

 		theNattablecellPackage.freeze();

+

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(NattablecellPackage.eNS_URI, theNattablecellPackage);

 		return theNattablecellPackage;

@@ -173,7 +174,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -184,7 +184,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -195,7 +194,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -206,7 +204,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -217,7 +214,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -228,7 +224,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -239,7 +234,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -250,7 +244,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -261,7 +254,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -272,7 +264,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -283,7 +274,6 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -294,33 +284,33 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package. This method is

+	 * Creates the meta-model objects for the package.  This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated) {

-			return;

-		}

+		if (isCreated) return;

 		isCreated = true;

+

 		// Create classes and their features

 		cellEClass = createEClass(CELL);

 		createEReference(cellEClass, CELL__COLUMN_WRAPPER);

 		createEReference(cellEClass, CELL__ROW_WRAPPER);

 		createEReference(cellEClass, CELL__PROBLEMS);

+

 		iCellAxisWrapperEClass = createEClass(ICELL_AXIS_WRAPPER);

 		createEOperation(iCellAxisWrapperEClass, ICELL_AXIS_WRAPPER___GET_ELEMENT);

+

 		eObjectAxisWrapperEClass = createEClass(EOBJECT_AXIS_WRAPPER);

 		createEReference(eObjectAxisWrapperEClass, EOBJECT_AXIS_WRAPPER__ELEMENT);

+

 		idAxisWrapperEClass = createEClass(ID_AXIS_WRAPPER);

 		createEAttribute(idAxisWrapperEClass, ID_AXIS_WRAPPER__ELEMENT);

 	}

@@ -328,47 +318,53 @@ public class NattablecellPackageImpl extends EPackageImpl implements Nattablecel
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model. This

+	 * Complete the initialization of the package and its meta-model.  This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized) {

-			return;

-		}

+		if (isInitialized) return;

 		isInitialized = true;

+

 		// Initialize package

 		setName(eNAME);

 		setNsPrefix(eNS_PREFIX);

 		setNsURI(eNS_URI);

+

 		// Obtain other dependent packages

 		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

 		NattableproblemPackage theNattableproblemPackage = (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);

+

 		// Create type parameters

+

 		// Set bounds for type parameters

+

 		// Add supertypes to classes

 		cellEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

 		iCellAxisWrapperEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

 		eObjectAxisWrapperEClass.getESuperTypes().add(this.getICellAxisWrapper());

 		idAxisWrapperEClass.getESuperTypes().add(this.getICellAxisWrapper());

+

 		// Initialize classes, features, and operations; add parameters

 		initEClass(cellEClass, Cell.class, "Cell", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getCell_ColumnWrapper(), this.getICellAxisWrapper(), null, "columnWrapper", null, 1, 1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEReference(getCell_RowWrapper(), this.getICellAxisWrapper(), null, "rowWrapper", null, 1, 1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEReference(getCell_Problems(), theNattableproblemPackage.getProblem(), null, "problems", null, 0, -1, Cell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(iCellAxisWrapperEClass, ICellAxisWrapper.class, "ICellAxisWrapper", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEOperation(getICellAxisWrapper__GetElement(), ecorePackage.getEJavaObject(), "getElement", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(eObjectAxisWrapperEClass, EObjectAxisWrapper.class, "EObjectAxisWrapper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getEObjectAxisWrapper_Element(), ecorePackage.getEObject(), null, "element", null, 1, 1, EObjectAxisWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(idAxisWrapperEClass, IdAxisWrapper.class, "IdAxisWrapper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getIdAxisWrapper_Element(), ecorePackage.getEString(), "element", null, 0, 1, IdAxisWrapper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java
index 9d36c2d03b5..c8cd7785273 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellAdapterFactory.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Nattablece
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage

  * @generated

  */

@@ -38,7 +37,6 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattablecellPackage modelPackage;

@@ -47,11 +45,10 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattablecellAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattablecellPackage.eINSTANCE;

 		}

 	}

@@ -61,16 +58,15 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

+		if (object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

@@ -80,49 +76,40 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NattablecellSwitch<Adapter> modelSwitch = new NattablecellSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseCell(Cell object) {

-			return createCellAdapter();

-		}

-

-		@Override

-		public Adapter caseICellAxisWrapper(ICellAxisWrapper object) {

-			return createICellAxisWrapperAdapter();

-		}

-

-		@Override

-		public Adapter caseEObjectAxisWrapper(EObjectAxisWrapper object) {

-			return createEObjectAxisWrapperAdapter();

-		}

-

-		@Override

-		public Adapter caseIdAxisWrapper(IdAxisWrapper object) {

-			return createIdAxisWrapperAdapter();

-		}

-

-		@Override

-		public Adapter caseEModelElement(EModelElement object) {

-			return createEModelElementAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

+			@Override

+			public Adapter caseCell(Cell object) {

+				return createCellAdapter();

+			}

+			@Override

+			public Adapter caseICellAxisWrapper(ICellAxisWrapper object) {

+				return createICellAxisWrapperAdapter();

+			}

+			@Override

+			public Adapter caseEObjectAxisWrapper(EObjectAxisWrapper object) {

+				return createEObjectAxisWrapperAdapter();

+			}

+			@Override

+			public Adapter caseIdAxisWrapper(IdAxisWrapper object) {

+				return createIdAxisWrapperAdapter();

+			}

+			@Override

+			public Adapter caseEModelElement(EModelElement object) {

+				return createEModelElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *        the object to adapt.

+	 * @param target the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -137,7 +124,6 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
 	 * 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.nattablecell.Cell

 	 * @generated

@@ -147,13 +133,11 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper

-	 * <em>ICell Axis Wrapper</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.ICellAxisWrapper <em>ICell Axis Wrapper</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.nattablecell.ICellAxisWrapper

 	 * @generated

@@ -163,13 +147,11 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper

-	 * <em>EObject Axis Wrapper</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.EObjectAxisWrapper <em>EObject Axis Wrapper</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.nattablecell.EObjectAxisWrapper

 	 * @generated

@@ -179,13 +161,11 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper

-	 * <em>Id Axis Wrapper</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.IdAxisWrapper <em>Id Axis Wrapper</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.nattablecell.IdAxisWrapper

 	 * @generated

@@ -200,7 +180,6 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.ecore.EModelElement

 	 * @generated

@@ -214,7 +193,6 @@ public class NattablecellAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java
index 287a027d5f1..2ee123be934 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecell/util/NattablecellSwitch.java
@@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Nattablece
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.NattablecellPackage

  * @generated

  */

@@ -41,7 +40,6 @@ public class NattablecellSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattablecellPackage modelPackage;

@@ -50,11 +48,10 @@ public class NattablecellSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattablecellSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattablecellPackage.eINSTANCE;

 		}

 	}

@@ -63,8 +60,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

+	 * @param ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

 	 */

@@ -77,69 +73,43 @@ public class NattablecellSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case NattablecellPackage.CELL:

-		{

-			Cell cell = (Cell)theEObject;

-			T result = caseCell(cell);

-			if(result == null) {

-				result = caseEModelElement(cell);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablecellPackage.ICELL_AXIS_WRAPPER:

-		{

-			ICellAxisWrapper iCellAxisWrapper = (ICellAxisWrapper)theEObject;

-			T result = caseICellAxisWrapper(iCellAxisWrapper);

-			if(result == null) {

-				result = caseEModelElement(iCellAxisWrapper);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

+		switch (classifierID) {

+			case NattablecellPackage.CELL: {

+				Cell cell = (Cell)theEObject;

+				T result = caseCell(cell);

+				if (result == null) result = caseEModelElement(cell);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			return result;

-		}

-		case NattablecellPackage.EOBJECT_AXIS_WRAPPER:

-		{

-			EObjectAxisWrapper eObjectAxisWrapper = (EObjectAxisWrapper)theEObject;

-			T result = caseEObjectAxisWrapper(eObjectAxisWrapper);

-			if(result == null) {

-				result = caseICellAxisWrapper(eObjectAxisWrapper);

+			case NattablecellPackage.ICELL_AXIS_WRAPPER: {

+				ICellAxisWrapper iCellAxisWrapper = (ICellAxisWrapper)theEObject;

+				T result = caseICellAxisWrapper(iCellAxisWrapper);

+				if (result == null) result = caseEModelElement(iCellAxisWrapper);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = caseEModelElement(eObjectAxisWrapper);

+			case NattablecellPackage.EOBJECT_AXIS_WRAPPER: {

+				EObjectAxisWrapper eObjectAxisWrapper = (EObjectAxisWrapper)theEObject;

+				T result = caseEObjectAxisWrapper(eObjectAxisWrapper);

+				if (result == null) result = caseICellAxisWrapper(eObjectAxisWrapper);

+				if (result == null) result = caseEModelElement(eObjectAxisWrapper);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = defaultCase(theEObject);

+			case NattablecellPackage.ID_AXIS_WRAPPER: {

+				IdAxisWrapper idAxisWrapper = (IdAxisWrapper)theEObject;

+				T result = caseIdAxisWrapper(idAxisWrapper);

+				if (result == null) result = caseICellAxisWrapper(idAxisWrapper);

+				if (result == null) result = caseEModelElement(idAxisWrapper);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			return result;

-		}

-		case NattablecellPackage.ID_AXIS_WRAPPER:

-		{

-			IdAxisWrapper idAxisWrapper = (IdAxisWrapper)theEObject;

-			T result = caseIdAxisWrapper(idAxisWrapper);

-			if(result == null) {

-				result = caseICellAxisWrapper(idAxisWrapper);

-			}

-			if(result == null) {

-				result = caseEModelElement(idAxisWrapper);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -149,9 +119,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Cell</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -166,9 +134,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>ICell Axis Wrapper</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -183,9 +149,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject Axis Wrapper</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -200,9 +164,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Id Axis Wrapper</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -217,9 +179,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -234,9 +194,7 @@ public class NattablecellSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
index 78f02ab50d2..ce52c4e243c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
@@ -24,11 +24,10 @@ import org.eclipse.emf.common.util.Enumerator;
  * and utility methods for working with them.

  * <!-- end-user-doc -->

  * <!-- begin-model-doc -->

- * Indicates how the CellEditor must be declared.

- * In the common table, we display features as columns and objects as line.

+ * Indicates how the CellEditor must be declared. 

+ * In the common table, we display features as columns and objects as line. 

  * In this case the cell editors are specific to features, so the cell editor must be declared on the columns.

  * <!-- end-model-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getCellEditorDeclaration()

  * @model

  * @generated

@@ -38,7 +37,6 @@ public enum CellEditorDeclaration implements Enumerator {
 	 * The '<em><b>COLUMN</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #COLUMN_VALUE

 	 * @generated

 	 * @ordered

@@ -48,7 +46,6 @@ public enum CellEditorDeclaration implements Enumerator {
 	 * The '<em><b>ROW</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #ROW_VALUE

 	 * @generated

 	 * @ordered

@@ -58,7 +55,6 @@ public enum CellEditorDeclaration implements Enumerator {
 	 * The '<em><b>CELL</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #CELL_VALUE

 	 * @generated

 	 * @ordered

@@ -72,7 +68,6 @@ public enum CellEditorDeclaration implements Enumerator {
 	 * If the meaning of '<em><b>COLUMN</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #COLUMN

 	 * @model

 	 * @generated

@@ -87,7 +82,6 @@ public enum CellEditorDeclaration implements Enumerator {
 	 * If the meaning of '<em><b>ROW</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #ROW

 	 * @model

 	 * @generated

@@ -102,7 +96,6 @@ public enum CellEditorDeclaration implements Enumerator {
 	 * If the meaning of '<em><b>CELL</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #CELL

 	 * @model

 	 * @generated

@@ -114,16 +107,18 @@ public enum CellEditorDeclaration implements Enumerator {
 	 * An array of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	private static final CellEditorDeclaration[] VALUES_ARRAY = new CellEditorDeclaration[]{ COLUMN, ROW, CELL, };

+	private static final CellEditorDeclaration[] VALUES_ARRAY = new CellEditorDeclaration[] {

+			COLUMN,

+			ROW,

+			CELL,

+		};

 

 	/**

 	 * A public read-only list of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static final List<CellEditorDeclaration> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -132,13 +127,14 @@ public enum CellEditorDeclaration implements Enumerator {
 	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param literal the literal.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static CellEditorDeclaration get(String literal) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			CellEditorDeclaration result = VALUES_ARRAY[i];

-			if(result.toString().equals(literal)) {

+			if (result.toString().equals(literal)) {

 				return result;

 			}

 		}

@@ -149,13 +145,14 @@ public enum CellEditorDeclaration implements Enumerator {
 	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param name the name.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static CellEditorDeclaration getByName(String name) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			CellEditorDeclaration result = VALUES_ARRAY[i];

-			if(result.getName().equals(name)) {

+			if (result.getName().equals(name)) {

 				return result;

 			}

 		}

@@ -166,17 +163,15 @@ public enum CellEditorDeclaration implements Enumerator {
 	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param value the integer value.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static CellEditorDeclaration get(int value) {

-		switch(value) {

-		case COLUMN_VALUE:

-			return COLUMN;

-		case ROW_VALUE:

-			return ROW;

-		case CELL_VALUE:

-			return CELL;

+		switch (value) {

+			case COLUMN_VALUE: return COLUMN;

+			case ROW_VALUE: return ROW;

+			case CELL_VALUE: return CELL;

 		}

 		return null;

 	}

@@ -184,7 +179,6 @@ public enum CellEditorDeclaration implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final int value;

@@ -192,7 +186,6 @@ public enum CellEditorDeclaration implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final String name;

@@ -200,7 +193,6 @@ public enum CellEditorDeclaration implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final String literal;

@@ -209,7 +201,6 @@ public enum CellEditorDeclaration implements Enumerator {
 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private CellEditorDeclaration(int value, String name, String literal) {

@@ -221,41 +212,37 @@ public enum CellEditorDeclaration implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int getValue() {

-		return value;

+	  return value;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getName() {

-		return name;

+	  return name;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getLiteral() {

-		return literal;

+	  return literal;

 	}

 

 	/**

 	 * Returns the literal value of the enumerator, which is its string representation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
index dd75a79c4d0..6596b081db8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

  * @generated

  */

@@ -29,7 +28,6 @@ public interface NattableconfigurationFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattableconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationFactoryImpl.init();

@@ -38,7 +36,6 @@ public interface NattableconfigurationFactory extends EFactory {
 	 * Returns a new object of class '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Table Configuration</em>'.

 	 * @generated

 	 */

@@ -48,7 +45,6 @@ public interface NattableconfigurationFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
index 1d30a436bbc..f5365bbd29e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
@@ -31,11 +31,9 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory

  * @model kind="package"

- *        annotation=

- *        "http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"

+ *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"

  * @generated

  */

 public interface NattableconfigurationPackage extends EPackage {

@@ -44,7 +42,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNAME = "nattableconfiguration"; //$NON-NLS-1$

@@ -53,7 +50,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"; //$NON-NLS-1$

@@ -62,7 +58,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "nattableconfiguration"; //$NON-NLS-1$

@@ -71,17 +66,14 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattableconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl

-	 * <em>Table Named Element</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl <em>Table Named Element</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableNamedElement()

 	 * @generated

@@ -92,7 +84,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -102,7 +93,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -112,7 +102,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -122,7 +111,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -132,7 +120,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Table Named Element</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -142,7 +129,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -152,7 +138,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -162,7 +147,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -172,7 +156,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -182,18 +165,15 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>Table Named Element</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int TABLE_NAMED_ELEMENT_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl

-	 * <em>Table Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl <em>Table Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableConfiguration()

 	 * @generated

@@ -204,7 +184,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -214,7 +193,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -224,7 +202,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -234,7 +211,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -244,7 +220,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Type</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -254,7 +229,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Icon Path</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -264,7 +238,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Creation Tester</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -274,7 +247,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Cell Editor Declaration</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -284,7 +256,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Row Header Axis Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -294,7 +265,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Column Header Axis Configuration</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -304,7 +274,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Column Axis Providers</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -314,7 +283,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Row Axis Providers</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -324,7 +292,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Default Row Axis Provider</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -334,7 +301,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The feature id for the '<em><b>Default Column Axis Provider</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -344,7 +310,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The number of structural features of the '<em>Table Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -354,7 +319,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -364,7 +328,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -374,7 +337,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -384,7 +346,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -394,18 +355,15 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * The number of operations of the '<em>Table Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int TABLE_CONFIGURATION_OPERATION_COUNT = TABLE_NAMED_ELEMENT_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.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

@@ -413,11 +371,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	int CELL_EDITOR_DECLARATION = 2;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

-	 * <em>Table Named Element</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Table Named Element</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

 	 * @generated

@@ -425,11 +381,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EClass getTableNamedElement();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Description</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription()

 	 * @see #getTableNamedElement()

@@ -438,11 +392,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EAttribute getTableNamedElement_Description();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Name</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName()

 	 * @see #getTableNamedElement()

@@ -451,11 +403,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EAttribute getTableNamedElement_Name();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration

-	 * <em>Table Configuration</em>}'.

+	 * 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

@@ -463,11 +413,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EClass getTableConfiguration();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}'.

+	 * 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()

@@ -476,11 +424,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	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>}'.

+	 * 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()

@@ -489,11 +435,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	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>}'.

+	 * 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()

@@ -502,12 +446,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EReference getTableConfiguration_CreationTester();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration

-	 * <em>Cell Editor Declaration</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Cell Editor Declaration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration()

 	 * @see #getTableConfiguration()

@@ -516,12 +457,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EAttribute getTableConfiguration_CellEditorDeclaration();

 

 	/**

-	 * Returns the meta object for the containment reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration

-	 * <em>Row Header Axis Configuration</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference '<em>Row Header Axis Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration()

 	 * @see #getTableConfiguration()

@@ -530,12 +468,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EReference getTableConfiguration_RowHeaderAxisConfiguration();

 

 	/**

-	 * Returns the meta object for the containment reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration

-	 * <em>Column Header Axis Configuration</em>}'.

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference '<em>Column Header Axis Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration()

 	 * @see #getTableConfiguration()

@@ -544,12 +479,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EReference getTableConfiguration_ColumnHeaderAxisConfiguration();

 

 	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders

-	 * <em>Column Axis Providers</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders <em>Column Axis Providers</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Column Axis Providers</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders()

 	 * @see #getTableConfiguration()

@@ -558,12 +490,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EReference getTableConfiguration_ColumnAxisProviders();

 

 	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders

-	 * <em>Row Axis Providers</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders <em>Row Axis Providers</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Row Axis Providers</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders()

 	 * @see #getTableConfiguration()

@@ -572,12 +501,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EReference getTableConfiguration_RowAxisProviders();

 

 	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider

-	 * <em>Default Row Axis Provider</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Default Row Axis Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider()

 	 * @see #getTableConfiguration()

@@ -586,12 +512,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EReference getTableConfiguration_DefaultRowAxisProvider();

 

 	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider

-	 * <em>Default Column Axis Provider</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>Default Column Axis Provider</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider()

 	 * @see #getTableConfiguration()

@@ -600,11 +523,9 @@ public interface NattableconfigurationPackage extends EPackage {
 	EReference getTableConfiguration_DefaultColumnAxisProvider();

 

 	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-	 * <em>Cell Editor Declaration</em>}'.

+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for enum '<em>Cell Editor Declaration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

 	 * @generated

@@ -615,7 +536,6 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -632,17 +552,14 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	interface Literals {

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl

-		 * <em>Table Named Element</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl <em>Table Named Element</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableNamedElement()

 		 * @generated

@@ -653,7 +570,6 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute TABLE_NAMED_ELEMENT__DESCRIPTION = eINSTANCE.getTableNamedElement_Description();

@@ -662,18 +578,14 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute TABLE_NAMED_ELEMENT__NAME = eINSTANCE.getTableNamedElement_Name();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl <em>Table Configuration</em>}'

-		 * class.

+		 * 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

@@ -684,7 +596,6 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute TABLE_CONFIGURATION__TYPE = eINSTANCE.getTableConfiguration_Type();

@@ -693,7 +604,6 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Icon Path</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute TABLE_CONFIGURATION__ICON_PATH = eINSTANCE.getTableConfiguration_IconPath();

@@ -702,7 +612,6 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Creation Tester</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE_CONFIGURATION__CREATION_TESTER = eINSTANCE.getTableConfiguration_CreationTester();

@@ -711,7 +620,6 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Cell Editor Declaration</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION = eINSTANCE.getTableConfiguration_CellEditorDeclaration();

@@ -720,7 +628,6 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Row Header Axis Configuration</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTableConfiguration_RowHeaderAxisConfiguration();

@@ -729,7 +636,6 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Column Header Axis Configuration</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION = eINSTANCE.getTableConfiguration_ColumnHeaderAxisConfiguration();

@@ -738,7 +644,6 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Column Axis Providers</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS = eINSTANCE.getTableConfiguration_ColumnAxisProviders();

@@ -747,7 +652,6 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Row Axis Providers</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS = eINSTANCE.getTableConfiguration_RowAxisProviders();

@@ -756,7 +660,6 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Default Row Axis Provider</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER = eINSTANCE.getTableConfiguration_DefaultRowAxisProvider();

@@ -765,17 +668,14 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Default Column Axis Provider</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER = eINSTANCE.getTableConfiguration_DefaultColumnAxisProvider();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-		 * <em>Cell Editor Declaration</em>}' enum.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getCellEditorDeclaration()

 		 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
index b0f45f45639..e785d0b5b9f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
@@ -23,40 +23,31 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Abstract
  * <!-- end-user-doc -->

  *

  * <!-- begin-model-doc -->

- * This object is used to configure a table. To create a new type of table, you must create

+ * This object is used to configure a table. To create a new type of table, you must create 

  * a new file *.nattableConfiguration and register it using the extension point org.eclipse.papyrus.infra.nattable.configuration

- *

+ * 

  * the defaultAxisProviders can be : Master/Master, Master/Slave, Slave/Master and never Slave/Slave.

  * <!-- end-model-doc -->

  *

  * <p>

  * The following features are supported:

+ * </p>

  * <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>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor

- * Declaration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header

- * Axis Configuration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column

- * Header Axis Configuration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders <em>Column Axis

- * Providers</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders <em>Row Axis Providers

- * </em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row

- * Axis Provider</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default

- * Column Axis Provider</em>}</li>

+ *   <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>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnAxisProviders <em>Column Axis Providers</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowAxisProviders <em>Row Axis Providers</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration()

- * @model annotation=

- *        "http://www.eclipse.org/emf/2002/Ecore constraints='defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath'"

- *        annotation=

- *        "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot defaultRowAxisProviderExistsInCollection='rowAxisProviders->includes(defaultRowAxisProvider)' defaultColumnAxisProviderExistsInCollection='columnAxisProviders->includes(defaultColumnAxisProvider)' typeNonNullNonEmpty='not (type.oclIsUndefined() or type = \'\')' iconPath='not (iconPath.oclIsUndefined() or iconPath = \'\')' defaultAxisProvidersTypes='not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"

+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath'"

+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot defaultRowAxisProviderExistsInCollection='rowAxisProviders->includes(defaultRowAxisProvider)' defaultColumnAxisProviderExistsInCollection='columnAxisProviders->includes(defaultColumnAxisProvider)' typeNonNullNonEmpty='not (type.oclIsUndefined() or type = \'\')' iconPath='not (iconPath.oclIsUndefined() or iconPath = \'\')' defaultAxisProvidersTypes='not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))'"

  * @generated

  */

 public interface TableConfiguration extends TableNamedElement {

@@ -66,10 +57,9 @@ public interface TableConfiguration extends TableNamedElement {
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * <!-- begin-model-doc -->

-	 * The type of the table. This value is used to be able to open/close easily the table editor in Papyrus.

+	 * The type of the table. This value is used to be able to open/close easily the table editor in Papyrus. 

 	 * Moreover it allows to distinghuish easily the table.

 	 * <!-- end-model-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()

@@ -79,13 +69,10 @@ public interface TableConfiguration extends TableNamedElement {
 	String getType();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}

-	 * ' attribute.

+	 * 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.

+	 * @param value the new value of the '<em>Type</em>' attribute.

 	 * @see #getType()

 	 * @generated

 	 */

@@ -98,7 +85,6 @@ public interface TableConfiguration extends TableNamedElement {
 	 * <!-- begin-model-doc -->

 	 * The path of the icon to use for the table which references this TableConfiguration.

 	 * <!-- end-model-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()

@@ -108,13 +94,10 @@ public interface TableConfiguration extends TableNamedElement {
 	String getIconPath();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath

-	 * <em>Icon Path</em>}' attribute.

+	 * 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.

+	 * @param value the new value of the '<em>Icon Path</em>' attribute.

 	 * @see #getIconPath()

 	 * @generated

 	 */

@@ -128,7 +111,6 @@ public interface TableConfiguration extends TableNamedElement {
 	 * This value could be null. The tester is used to know if this tableConfiguration can be used

 	 * to create a new table using as context the selected element.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Creation Tester</em>' containment reference.

 	 * @see #setCreationTester(AbstractTableTester)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_CreationTester()

@@ -138,13 +120,10 @@ public interface TableConfiguration extends TableNamedElement {
 	AbstractTableTester getCreationTester();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester

-	 * <em>Creation Tester</em>}' containment reference.

+	 * 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.

+	 * @param value the new value of the '<em>Creation Tester</em>' containment reference.

 	 * @see #getCreationTester()

 	 * @generated

 	 */

@@ -157,11 +136,10 @@ public interface TableConfiguration extends TableNamedElement {
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * <!-- begin-model-doc -->

-	 * This value can't be null. Indicates how the CellEditor must be declared.

-	 * In the common table, we display features as columns and objects as line.

+	 * This value can't be null. Indicates how the CellEditor must be declared. 

+	 * In the common table, we display features as columns and objects as line. 

 	 * In this case the cell editors are specific to features, so the cell editor must be declared on the columns.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Cell Editor Declaration</em>' attribute.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

 	 * @see #setCellEditorDeclaration(CellEditorDeclaration)

@@ -172,14 +150,10 @@ public interface TableConfiguration extends TableNamedElement {
 	CellEditorDeclaration getCellEditorDeclaration();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration

-	 * <em>Cell Editor Declaration</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Cell Editor Declaration</em>' attribute.

+	 * @param value the new value of the '<em>Cell Editor Declaration</em>' attribute.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

 	 * @see #getCellEditorDeclaration()

 	 * @generated

@@ -193,7 +167,6 @@ public interface TableConfiguration extends TableNamedElement {
 	 * <!-- begin-model-doc -->

 	 * This value can't be null. Gives the initial row configuration of the table.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Row Header Axis Configuration</em>' containment reference.

 	 * @see #setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_RowHeaderAxisConfiguration()

@@ -203,14 +176,10 @@ public interface TableConfiguration extends TableNamedElement {
 	TableHeaderAxisConfiguration getRowHeaderAxisConfiguration();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration

-	 * <em>Row Header Axis Configuration</em>}' containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Row Header Axis Configuration</em>' containment reference.

+	 * @param value the new value of the '<em>Row Header Axis Configuration</em>' containment reference.

 	 * @see #getRowHeaderAxisConfiguration()

 	 * @generated

 	 */

@@ -223,7 +192,6 @@ public interface TableConfiguration extends TableNamedElement {
 	 * <!-- begin-model-doc -->

 	 * This value can't be null. Gives the initial column configuration of the table.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Column Header Axis Configuration</em>' containment reference.

 	 * @see #setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_ColumnHeaderAxisConfiguration()

@@ -233,14 +201,10 @@ public interface TableConfiguration extends TableNamedElement {
 	TableHeaderAxisConfiguration getColumnHeaderAxisConfiguration();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration

-	 * <em>Column Header Axis Configuration</em>}' containment reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Column Header Axis Configuration</em>' containment reference.

+	 * @param value the new value of the '<em>Column Header Axis Configuration</em>' containment reference.

 	 * @see #getColumnHeaderAxisConfiguration()

 	 * @generated

 	 */

@@ -254,7 +218,6 @@ public interface TableConfiguration extends TableNamedElement {
 	 * <!-- begin-model-doc -->

 	 * This list can't be empty. Contains list of possible column AxisProvider for the table.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Column Axis Providers</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_ColumnAxisProviders()

 	 * @model containment="true" required="true"

@@ -270,7 +233,6 @@ public interface TableConfiguration extends TableNamedElement {
 	 * <!-- begin-model-doc -->

 	 * This list can't be empty. Contains a list of possible row AxisProvider for the table.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Row Axis Providers</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_RowAxisProviders()

 	 * @model containment="true" required="true"

@@ -285,7 +247,6 @@ public interface TableConfiguration extends TableNamedElement {
 	 * <!-- begin-model-doc -->

 	 * This value can't be null. References the Axis Provider to use by default for rows.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Default Row Axis Provider</em>' reference.

 	 * @see #setDefaultRowAxisProvider(AbstractAxisProvider)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_DefaultRowAxisProvider()

@@ -295,14 +256,10 @@ public interface TableConfiguration extends TableNamedElement {
 	AbstractAxisProvider getDefaultRowAxisProvider();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider

-	 * <em>Default Row Axis Provider</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Default Row Axis Provider</em>' reference.

+	 * @param value the new value of the '<em>Default Row Axis Provider</em>' reference.

 	 * @see #getDefaultRowAxisProvider()

 	 * @generated

 	 */

@@ -315,7 +272,6 @@ public interface TableConfiguration extends TableNamedElement {
 	 * <!-- begin-model-doc -->

 	 * This value can't be null. References the Axis Provider to use by default for columns.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Default Column Axis Provider</em>' reference.

 	 * @see #setDefaultColumnAxisProvider(AbstractAxisProvider)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_DefaultColumnAxisProvider()

@@ -325,14 +281,10 @@ public interface TableConfiguration extends TableNamedElement {
 	AbstractAxisProvider getDefaultColumnAxisProvider();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider

-	 * <em>Default Column Axis Provider</em>}' reference.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Default Column Axis Provider</em>' reference.

+	 * @param value the new value of the '<em>Default Column Axis Provider</em>' reference.

 	 * @see #getDefaultColumnAxisProvider()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
index ac0af0e694c..e095183d3fa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
@@ -25,11 +25,11 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement()

  * @model abstract="true"

@@ -46,7 +46,6 @@ public interface TableNamedElement extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * The description of the named element.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Description</em>' attribute.

 	 * @see #setDescription(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement_Description()

@@ -56,13 +55,10 @@ public interface TableNamedElement extends StyledElement {
 	String getDescription();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription

-	 * <em>Description</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Description</em>' attribute.

+	 * @param value the new value of the '<em>Description</em>' attribute.

 	 * @see #getDescription()

 	 * @generated

 	 */

@@ -75,7 +71,6 @@ public interface TableNamedElement extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * The name of the named element.

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Name</em>' attribute.

 	 * @see #setName(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement_Name()

@@ -85,13 +80,10 @@ public interface TableNamedElement extends StyledElement {
 	String getName();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Name</em>' attribute.

+	 * @param value the new value of the '<em>Name</em>' attribute.

 	 * @see #getName()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
index 29c24aff285..0729bbb0861 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
@@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattableconfigurationFactoryImpl extends EFactoryImpl implements NattableconfigurationFactory {

@@ -36,16 +35,16 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static NattableconfigurationFactory init() {

 		try {

 			NattableconfigurationFactory theNattableconfigurationFactory = (NattableconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableconfigurationPackage.eNS_URI);

-			if(theNattableconfigurationFactory != null) {

+			if (theNattableconfigurationFactory != null) {

 				return theNattableconfigurationFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new NattableconfigurationFactoryImpl();

@@ -55,7 +54,6 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableconfigurationFactoryImpl() {

@@ -65,55 +63,50 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

-		case NattableconfigurationPackage.TABLE_CONFIGURATION:

-			return createTableConfiguration();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eClass.getClassifierID()) {

+			case NattableconfigurationPackage.TABLE_CONFIGURATION: return createTableConfiguration();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch(eDataType.getClassifierID()) {

-		case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

-			return createCellEditorDeclarationFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eDataType.getClassifierID()) {

+			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

+				return createCellEditorDeclarationFromString(eDataType, initialValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch(eDataType.getClassifierID()) {

-		case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

-			return convertCellEditorDeclarationToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eDataType.getClassifierID()) {

+			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

+				return convertCellEditorDeclarationToString(eDataType, instanceValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -125,21 +118,17 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public CellEditorDeclaration createCellEditorDeclarationFromString(EDataType eDataType, String initialValue) {

 		CellEditorDeclaration result = CellEditorDeclaration.get(initialValue);

-		if(result == null) {

-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		}

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String convertCellEditorDeclarationToString(EDataType eDataType, Object instanceValue) {

@@ -149,7 +138,6 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -160,7 +148,6 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
index cdf0d3966a6..82008af7110 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
@@ -49,7 +49,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattableconfigurationPackageImpl extends EPackageImpl implements NattableconfigurationPackage {

@@ -57,7 +56,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass tableNamedElementEClass = null;

@@ -65,7 +63,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass tableConfigurationEClass = null;

@@ -73,19 +70,19 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EEnum cellEditorDeclarationEEnum = null;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

 	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#eNS_URI

 	 * @see #init()

@@ -98,32 +95,32 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link NattableconfigurationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it

-	 * directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * 

+	 * <p>This method is used to initialize {@link NattableconfigurationPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static NattableconfigurationPackage init() {

-		if(isInited) {

-			return (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

-		}

+		if (isInited) return (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

+

 		// Obtain or create and register package

 		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableconfigurationPackageImpl());

+

 		isInited = true;

+

 		// Initialize simple dependencies

 		EcorePackage.eINSTANCE.eClass();

+

 		// Obtain or create and register interdependencies

 		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

 		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);

@@ -134,6 +131,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

 		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

 		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

+

 		// Create package meta-data objects

 		theNattableconfigurationPackage.createPackageContents();

 		theNattablePackage.createPackageContents();

@@ -145,6 +143,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 		theNattablecellPackage.createPackageContents();

 		theNattableproblemPackage.createPackageContents();

 		theNattablestylePackage.createPackageContents();

+

 		// Initialize created meta-data

 		theNattableconfigurationPackage.initializePackageContents();

 		theNattablePackage.initializePackageContents();

@@ -156,16 +155,20 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 		theNattablecellPackage.initializePackageContents();

 		theNattableproblemPackage.initializePackageContents();

 		theNattablestylePackage.initializePackageContents();

+

 		// Register package validator

-		EValidator.Registry.INSTANCE.put(theNattableconfigurationPackage, new EValidator.Descriptor() {

+		EValidator.Registry.INSTANCE.put

+			(theNattableconfigurationPackage, 

+			 new EValidator.Descriptor() {

+				 public EValidator getEValidator() {

+					 return NattableconfigurationValidator.INSTANCE;

+				 }

+			 });

 

-			@Override

-			public EValidator getEValidator() {

-				return NattableconfigurationValidator.INSTANCE;

-			}

-		});

 		// Mark meta-data to indicate it can't be changed

 		theNattableconfigurationPackage.freeze();

+

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(NattableconfigurationPackage.eNS_URI, theNattableconfigurationPackage);

 		return theNattableconfigurationPackage;

@@ -174,7 +177,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -185,7 +187,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -196,7 +197,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -207,7 +207,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -218,7 +217,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -229,7 +227,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -240,7 +237,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -251,7 +247,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -262,7 +257,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -273,7 +267,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -284,7 +277,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -295,7 +287,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -306,7 +297,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -317,7 +307,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -328,7 +317,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -339,7 +327,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -350,28 +337,26 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package. This method is

+	 * Creates the meta-model objects for the package.  This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated) {

-			return;

-		}

+		if (isCreated) return;

 		isCreated = true;

+

 		// Create classes and their features

 		tableNamedElementEClass = createEClass(TABLE_NAMED_ELEMENT);

 		createEAttribute(tableNamedElementEClass, TABLE_NAMED_ELEMENT__DESCRIPTION);

 		createEAttribute(tableNamedElementEClass, TABLE_NAMED_ELEMENT__NAME);

+

 		tableConfigurationEClass = createEClass(TABLE_CONFIGURATION);

 		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__TYPE);

 		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__ICON_PATH);

@@ -383,6 +368,7 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);

 		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER);

 		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER);

+

 		// Create enums

 		cellEditorDeclarationEEnum = createEEnum(CELL_EDITOR_DECLARATION);

 	}

@@ -390,42 +376,45 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model. This

+	 * Complete the initialization of the package and its meta-model.  This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized) {

-			return;

-		}

+		if (isInitialized) return;

 		isInitialized = true;

+

 		// Initialize package

 		setName(eNAME);

 		setNsPrefix(eNS_PREFIX);

 		setNsURI(eNS_URI);

+

 		// Obtain other dependent packages

 		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

 		NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);

 		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);

 		NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);

+

 		// Create type parameters

+

 		// Set bounds for type parameters

+

 		// Add supertypes to classes

 		tableNamedElementEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());

 		tableConfigurationEClass.getESuperTypes().add(this.getTableNamedElement());

+

 		// Initialize classes, features, and operations; add parameters

 		initEClass(tableNamedElementEClass, TableNamedElement.class, "TableNamedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getTableNamedElement_Description(), ecorePackage.getEString(), "description", null, 0, 1, TableNamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEAttribute(getTableNamedElement_Name(), ecorePackage.getEString(), "name", null, 1, 1, TableNamedElement.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(), ecorePackage.getEString(), "iconPath", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

@@ -437,11 +426,13 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 		initEReference(getTableConfiguration_RowAxisProviders(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "rowAxisProviders", null, 1, -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$

 		initEReference(getTableConfiguration_DefaultRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "defaultRowAxisProvider", null, 1, 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$

 		initEReference(getTableConfiguration_DefaultColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "defaultColumnAxisProvider", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		// Initialize enums and add enum literals

 		initEEnum(cellEditorDeclarationEEnum, CellEditorDeclaration.class, "CellEditorDeclaration"); //$NON-NLS-1$

 		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.COLUMN);

 		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.ROW);

 		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.CELL);

+

 		// Create annotations

 		// http://www.eclipse.org/emf/2002/Ecore

 		createEcoreAnnotations();

@@ -453,37 +444,55 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void createEcoreAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$

-		addAnnotation(this, source, new String[]{ "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-		"settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-		"validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$

-		});

-		addAnnotation(tableNamedElementEClass, source, new String[]{ "constraints", "nonEmptyName" //$NON-NLS-1$ //$NON-NLS-2$

-		});

-		addAnnotation(tableConfigurationEClass, source, new String[]{ "constraints", "defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath" //$NON-NLS-1$ //$NON-NLS-2$

-		});

+		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$	

+		addAnnotation

+		  (this, 

+		   source, 

+		   new String[] {

+			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

+			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

+			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$

+		   });	

+		addAnnotation

+		  (tableNamedElementEClass, 

+		   source, 

+		   new String[] {

+			 "constraints", "nonEmptyName" //$NON-NLS-1$ //$NON-NLS-2$

+		   });	

+		addAnnotation

+		  (tableConfigurationEClass, 

+		   source, 

+		   new String[] {

+			 "constraints", "defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection defaultAxisProvidersTypes typeNonNullNonEmpty iconPath" //$NON-NLS-1$ //$NON-NLS-2$

+		   });

 	}

 

 	/**

 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected void createPivotAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$

-		addAnnotation(tableNamedElementEClass, source, new String[]{ "nonEmptyName", "not (name.oclIsUndefined() or name = \'\')" //$NON-NLS-1$ //$NON-NLS-2$

-		});

-		addAnnotation(tableConfigurationEClass, source, new String[]{ "defaultRowAxisProviderExistsInCollection", "rowAxisProviders->includes(defaultRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

-		"defaultColumnAxisProviderExistsInCollection", "columnAxisProviders->includes(defaultColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

-		"typeNonNullNonEmpty", "not (type.oclIsUndefined() or type = \'\')", //$NON-NLS-1$ //$NON-NLS-2$

-		"iconPath", "not (iconPath.oclIsUndefined() or iconPath = \'\')", //$NON-NLS-1$ //$NON-NLS-2$

-		"defaultAxisProvidersTypes", "not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$

-		});

+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$	

+		addAnnotation

+		  (tableNamedElementEClass, 

+		   source, 

+		   new String[] {

+			 "nonEmptyName", "not (name.oclIsUndefined() or name = \'\')" //$NON-NLS-1$ //$NON-NLS-2$

+		   });	

+		addAnnotation

+		  (tableConfigurationEClass, 

+		   source, 

+		   new String[] {

+			 "defaultRowAxisProviderExistsInCollection", "rowAxisProviders->includes(defaultRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

+			 "defaultColumnAxisProviderExistsInCollection", "columnAxisProviders->includes(defaultColumnAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

+			 "typeNonNullNonEmpty", "not (type.oclIsUndefined() or type = \'\')", //$NON-NLS-1$ //$NON-NLS-2$

+			 "iconPath", "not (iconPath.oclIsUndefined() or iconPath = \'\')", //$NON-NLS-1$ //$NON-NLS-2$

+			 "defaultAxisProvidersTypes", "not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))" //$NON-NLS-1$ //$NON-NLS-2$

+		   });

 	}

 } // NattableconfigurationPackageImpl

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
index 6f512c5c23e..1eea9ef9fe9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
@@ -35,27 +35,19 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Abstract
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <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>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getCellEditorDeclaration <em>Cell

- * Editor Declaration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowHeaderAxisConfiguration <em>

- * Row Header Axis Configuration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnHeaderAxisConfiguration

- * <em>Column Header Axis Configuration</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnAxisProviders <em>Column

- * Axis Providers</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowAxisProviders <em>Row Axis

- * Providers</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultRowAxisProvider <em>

- * Default Row Axis Provider</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultColumnAxisProvider <em>

- * Default Column Axis Provider</em>}</li>

+ *   <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>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getCellEditorDeclaration <em>Cell Editor Declaration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getColumnAxisProviders <em>Column Axis Providers</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getRowAxisProviders <em>Row Axis Providers</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -65,7 +57,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getType()

 	 * @generated

 	 * @ordered

@@ -76,7 +67,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getType()

 	 * @generated

 	 * @ordered

@@ -87,7 +77,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The default value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getIconPath()

 	 * @generated

 	 * @ordered

@@ -98,7 +87,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getIconPath()

 	 * @generated

 	 * @ordered

@@ -109,7 +97,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The cached value of the '{@link #getCreationTester() <em>Creation Tester</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getCreationTester()

 	 * @generated

 	 * @ordered

@@ -120,7 +107,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The default value of the '{@link #getCellEditorDeclaration() <em>Cell Editor Declaration</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getCellEditorDeclaration()

 	 * @generated

 	 * @ordered

@@ -131,7 +117,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The cached value of the '{@link #getCellEditorDeclaration() <em>Cell Editor Declaration</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getCellEditorDeclaration()

 	 * @generated

 	 * @ordered

@@ -142,7 +127,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The cached value of the '{@link #getRowHeaderAxisConfiguration() <em>Row Header Axis Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getRowHeaderAxisConfiguration()

 	 * @generated

 	 * @ordered

@@ -153,7 +137,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The cached value of the '{@link #getColumnHeaderAxisConfiguration() <em>Column Header Axis Configuration</em>}' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getColumnHeaderAxisConfiguration()

 	 * @generated

 	 * @ordered

@@ -164,7 +147,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The cached value of the '{@link #getColumnAxisProviders() <em>Column Axis Providers</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getColumnAxisProviders()

 	 * @generated

 	 * @ordered

@@ -175,7 +157,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The cached value of the '{@link #getRowAxisProviders() <em>Row Axis Providers</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getRowAxisProviders()

 	 * @generated

 	 * @ordered

@@ -186,7 +167,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The cached value of the '{@link #getDefaultRowAxisProvider() <em>Default Row Axis Provider</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDefaultRowAxisProvider()

 	 * @generated

 	 * @ordered

@@ -197,7 +177,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	 * The cached value of the '{@link #getDefaultColumnAxisProvider() <em>Default Column Axis Provider</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDefaultColumnAxisProvider()

 	 * @generated

 	 * @ordered

@@ -207,7 +186,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected TableConfigurationImpl() {

@@ -217,7 +195,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -228,7 +205,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -239,22 +215,19 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setType(String newType) {

 		String oldType = type;

 		type = newType;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE, oldType, type));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -265,22 +238,19 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setIconPath(String newIconPath) {

 		String oldIconPath = iconPath;

 		iconPath = newIconPath;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH, oldIconPath, iconPath));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -291,19 +261,14 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetCreationTester(AbstractTableTester newCreationTester, NotificationChain msgs) {

 		AbstractTableTester oldCreationTester = creationTester;

 		creationTester = newCreationTester;

-		if(eNotificationRequired()) {

+		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);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -311,32 +276,26 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setCreationTester(AbstractTableTester newCreationTester) {

-		if(newCreationTester != creationTester) {

+		if (newCreationTester != creationTester) {

 			NotificationChain msgs = null;

-			if(creationTester != null) {

+			if (creationTester != null)

 				msgs = ((InternalEObject)creationTester).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);

-			}

-			if(newCreationTester != null) {

+			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));

+			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

@@ -347,22 +306,19 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setCellEditorDeclaration(CellEditorDeclaration newCellEditorDeclaration) {

 		CellEditorDeclaration oldCellEditorDeclaration = cellEditorDeclaration;

 		cellEditorDeclaration = newCellEditorDeclaration == null ? CELL_EDITOR_DECLARATION_EDEFAULT : newCellEditorDeclaration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION, oldCellEditorDeclaration, cellEditorDeclaration));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -373,19 +329,14 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration, NotificationChain msgs) {

 		TableHeaderAxisConfiguration oldRowHeaderAxisConfiguration = rowHeaderAxisConfiguration;

 		rowHeaderAxisConfiguration = newRowHeaderAxisConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, oldRowHeaderAxisConfiguration, newRowHeaderAxisConfiguration);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -393,32 +344,26 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration newRowHeaderAxisConfiguration) {

-		if(newRowHeaderAxisConfiguration != rowHeaderAxisConfiguration) {

+		if (newRowHeaderAxisConfiguration != rowHeaderAxisConfiguration) {

 			NotificationChain msgs = null;

-			if(rowHeaderAxisConfiguration != null) {

+			if (rowHeaderAxisConfiguration != null)

 				msgs = ((InternalEObject)rowHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);

-			}

-			if(newRowHeaderAxisConfiguration != null) {

+			if (newRowHeaderAxisConfiguration != null)

 				msgs = ((InternalEObject)newRowHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, null, msgs);

-			}

 			msgs = basicSetRowHeaderAxisConfiguration(newRowHeaderAxisConfiguration, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, newRowHeaderAxisConfiguration, newRowHeaderAxisConfiguration));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION, newRowHeaderAxisConfiguration, newRowHeaderAxisConfiguration));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -429,19 +374,14 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NotificationChain basicSetColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration, NotificationChain msgs) {

 		TableHeaderAxisConfiguration oldColumnHeaderAxisConfiguration = columnHeaderAxisConfiguration;

 		columnHeaderAxisConfiguration = newColumnHeaderAxisConfiguration;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired()) {

 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, oldColumnHeaderAxisConfiguration, newColumnHeaderAxisConfiguration);

-			if(msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

+			if (msgs == null) msgs = notification; else msgs.add(notification);

 		}

 		return msgs;

 	}

@@ -449,37 +389,31 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration newColumnHeaderAxisConfiguration) {

-		if(newColumnHeaderAxisConfiguration != columnHeaderAxisConfiguration) {

+		if (newColumnHeaderAxisConfiguration != columnHeaderAxisConfiguration) {

 			NotificationChain msgs = null;

-			if(columnHeaderAxisConfiguration != null) {

+			if (columnHeaderAxisConfiguration != null)

 				msgs = ((InternalEObject)columnHeaderAxisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);

-			}

-			if(newColumnHeaderAxisConfiguration != null) {

+			if (newColumnHeaderAxisConfiguration != null)

 				msgs = ((InternalEObject)newColumnHeaderAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, null, msgs);

-			}

 			msgs = basicSetColumnHeaderAxisConfiguration(newColumnHeaderAxisConfiguration, msgs);

-			if(msgs != null) {

-				msgs.dispatch();

-			}

-		} else if(eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, newColumnHeaderAxisConfiguration, newColumnHeaderAxisConfiguration));

+			if (msgs != null) msgs.dispatch();

 		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION, newColumnHeaderAxisConfiguration, newColumnHeaderAxisConfiguration));

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<AbstractAxisProvider> getColumnAxisProviders() {

-		if(columnAxisProviders == null) {

+		if (columnAxisProviders == null) {

 			columnAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS);

 		}

 		return columnAxisProviders;

@@ -488,12 +422,11 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<AbstractAxisProvider> getRowAxisProviders() {

-		if(rowAxisProviders == null) {

+		if (rowAxisProviders == null) {

 			rowAxisProviders = new EObjectContainmentEList<AbstractAxisProvider>(AbstractAxisProvider.class, this, NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS);

 		}

 		return rowAxisProviders;

@@ -502,18 +435,16 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public AbstractAxisProvider getDefaultRowAxisProvider() {

-		if(defaultRowAxisProvider != null && defaultRowAxisProvider.eIsProxy()) {

+		if (defaultRowAxisProvider != null && defaultRowAxisProvider.eIsProxy()) {

 			InternalEObject oldDefaultRowAxisProvider = (InternalEObject)defaultRowAxisProvider;

 			defaultRowAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultRowAxisProvider);

-			if(defaultRowAxisProvider != oldDefaultRowAxisProvider) {

-				if(eNotificationRequired()) {

+			if (defaultRowAxisProvider != oldDefaultRowAxisProvider) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER, oldDefaultRowAxisProvider, defaultRowAxisProvider));

-				}

 			}

 		}

 		return defaultRowAxisProvider;

@@ -522,7 +453,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public AbstractAxisProvider basicGetDefaultRowAxisProvider() {

@@ -532,33 +462,29 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDefaultRowAxisProvider(AbstractAxisProvider newDefaultRowAxisProvider) {

 		AbstractAxisProvider oldDefaultRowAxisProvider = defaultRowAxisProvider;

 		defaultRowAxisProvider = newDefaultRowAxisProvider;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER, oldDefaultRowAxisProvider, defaultRowAxisProvider));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public AbstractAxisProvider getDefaultColumnAxisProvider() {

-		if(defaultColumnAxisProvider != null && defaultColumnAxisProvider.eIsProxy()) {

+		if (defaultColumnAxisProvider != null && defaultColumnAxisProvider.eIsProxy()) {

 			InternalEObject oldDefaultColumnAxisProvider = (InternalEObject)defaultColumnAxisProvider;

 			defaultColumnAxisProvider = (AbstractAxisProvider)eResolveProxy(oldDefaultColumnAxisProvider);

-			if(defaultColumnAxisProvider != oldDefaultColumnAxisProvider) {

-				if(eNotificationRequired()) {

+			if (defaultColumnAxisProvider != oldDefaultColumnAxisProvider) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));

-				}

 			}

 		}

 		return defaultColumnAxisProvider;

@@ -567,7 +493,6 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public AbstractAxisProvider basicGetDefaultColumnAxisProvider() {

@@ -577,37 +502,34 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDefaultColumnAxisProvider(AbstractAxisProvider newDefaultColumnAxisProvider) {

 		AbstractAxisProvider oldDefaultColumnAxisProvider = defaultColumnAxisProvider;

 		defaultColumnAxisProvider = newDefaultColumnAxisProvider;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER, oldDefaultColumnAxisProvider, defaultColumnAxisProvider));

-		}

 	}

 

 	/**

 	 * <!-- 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);

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-			return basicSetRowHeaderAxisConfiguration(null, msgs);

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-			return basicSetColumnHeaderAxisConfiguration(null, msgs);

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-			return ((InternalEList<?>)getColumnAxisProviders()).basicRemove(otherEnd, msgs);

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-			return ((InternalEList<?>)getRowAxisProviders()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

+				return basicSetCreationTester(null, msgs);

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

+				return basicSetRowHeaderAxisConfiguration(null, msgs);

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

+				return basicSetColumnHeaderAxisConfiguration(null, msgs);

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

+				return ((InternalEList<?>)getColumnAxisProviders()).basicRemove(otherEnd, msgs);

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

+				return ((InternalEList<?>)getRowAxisProviders()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -615,38 +537,33 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- 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();

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

-			return getCellEditorDeclaration();

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-			return getRowHeaderAxisConfiguration();

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-			return getColumnHeaderAxisConfiguration();

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-			return getColumnAxisProviders();

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-			return getRowAxisProviders();

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

-			if(resolve) {

-				return getDefaultRowAxisProvider();

-			}

-			return basicGetDefaultRowAxisProvider();

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

-			if(resolve) {

-				return getDefaultColumnAxisProvider();

-			}

-			return basicGetDefaultColumnAxisProvider();

+		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();

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

+				return getCellEditorDeclaration();

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

+				return getRowHeaderAxisConfiguration();

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

+				return getColumnHeaderAxisConfiguration();

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

+				return getColumnAxisProviders();

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

+				return getRowAxisProviders();

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

+				if (resolve) return getDefaultRowAxisProvider();

+				return basicGetDefaultRowAxisProvider();

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

+				if (resolve) return getDefaultColumnAxisProvider();

+				return basicGetDefaultColumnAxisProvider();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -654,45 +571,44 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

-			setType((String)newValue);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

-			setIconPath((String)newValue);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-			setCreationTester((AbstractTableTester)newValue);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

-			setCellEditorDeclaration((CellEditorDeclaration)newValue);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-			setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration)newValue);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-			setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration)newValue);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-			getColumnAxisProviders().clear();

-			getColumnAxisProviders().addAll((Collection<? extends AbstractAxisProvider>)newValue);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-			getRowAxisProviders().clear();

-			getRowAxisProviders().addAll((Collection<? extends AbstractAxisProvider>)newValue);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

-			setDefaultRowAxisProvider((AbstractAxisProvider)newValue);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

-			setDefaultColumnAxisProvider((AbstractAxisProvider)newValue);

-			return;

+		switch (featureID) {

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

+				setType((String)newValue);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

+				setIconPath((String)newValue);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

+				setCreationTester((AbstractTableTester)newValue);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

+				setCellEditorDeclaration((CellEditorDeclaration)newValue);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

+				setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration)newValue);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

+				setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration)newValue);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

+				getColumnAxisProviders().clear();

+				getColumnAxisProviders().addAll((Collection<? extends AbstractAxisProvider>)newValue);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

+				getRowAxisProviders().clear();

+				getRowAxisProviders().addAll((Collection<? extends AbstractAxisProvider>)newValue);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

+				setDefaultRowAxisProvider((AbstractAxisProvider)newValue);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

+				setDefaultColumnAxisProvider((AbstractAxisProvider)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -700,42 +616,41 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

-			setType(TYPE_EDEFAULT);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

-			setIconPath(ICON_PATH_EDEFAULT);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

-			setCreationTester((AbstractTableTester)null);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

-			setCellEditorDeclaration(CELL_EDITOR_DECLARATION_EDEFAULT);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-			setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration)null);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-			setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration)null);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-			getColumnAxisProviders().clear();

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-			getRowAxisProviders().clear();

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

-			setDefaultRowAxisProvider((AbstractAxisProvider)null);

-			return;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

-			setDefaultColumnAxisProvider((AbstractAxisProvider)null);

-			return;

+		switch (featureID) {

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

+				setType(TYPE_EDEFAULT);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

+				setIconPath(ICON_PATH_EDEFAULT);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

+				setCreationTester((AbstractTableTester)null);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

+				setCellEditorDeclaration(CELL_EDITOR_DECLARATION_EDEFAULT);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

+				setRowHeaderAxisConfiguration((TableHeaderAxisConfiguration)null);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

+				setColumnHeaderAxisConfiguration((TableHeaderAxisConfiguration)null);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

+				getColumnAxisProviders().clear();

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

+				getRowAxisProviders().clear();

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

+				setDefaultRowAxisProvider((AbstractAxisProvider)null);

+				return;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

+				setDefaultColumnAxisProvider((AbstractAxisProvider)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -743,32 +658,31 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- 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;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

-			return cellEditorDeclaration != CELL_EDITOR_DECLARATION_EDEFAULT;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

-			return rowHeaderAxisConfiguration != null;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

-			return columnHeaderAxisConfiguration != null;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

-			return columnAxisProviders != null && !columnAxisProviders.isEmpty();

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

-			return rowAxisProviders != null && !rowAxisProviders.isEmpty();

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

-			return defaultRowAxisProvider != null;

-		case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

-			return defaultColumnAxisProvider != null;

+		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;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CELL_EDITOR_DECLARATION:

+				return cellEditorDeclaration != CELL_EDITOR_DECLARATION_EDEFAULT;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_HEADER_AXIS_CONFIGURATION:

+				return rowHeaderAxisConfiguration != null;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_HEADER_AXIS_CONFIGURATION:

+				return columnHeaderAxisConfiguration != null;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDERS:

+				return columnAxisProviders != null && !columnAxisProviders.isEmpty();

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ROW_AXIS_PROVIDERS:

+				return rowAxisProviders != null && !rowAxisProviders.isEmpty();

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER:

+				return defaultRowAxisProvider != null;

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER:

+				return defaultColumnAxisProvider != null;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -776,14 +690,12 @@ public class TableConfigurationImpl extends TableNamedElementImpl implements Tab
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (type: "); //$NON-NLS-1$

 		result.append(type);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
index 3573092e9ed..e15442d4f8e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
@@ -25,11 +25,11 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl#getDescription <em>Description</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl#getName <em>Name</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -39,7 +39,6 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDescription()

 	 * @generated

 	 * @ordered

@@ -50,7 +49,6 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDescription()

 	 * @generated

 	 * @ordered

@@ -61,7 +59,6 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getName()

 	 * @generated

 	 * @ordered

@@ -72,7 +69,6 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getName()

 	 * @generated

 	 * @ordered

@@ -82,7 +78,6 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected TableNamedElementImpl() {

@@ -92,7 +87,6 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -103,7 +97,6 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -114,22 +107,19 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDescription(String newDescription) {

 		String oldDescription = description;

 		description = newDescription;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION, oldDescription, description));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -140,31 +130,28 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setName(String newName) {

 		String oldName = name;

 		name = newName;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME, oldName, name));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-			return getDescription();

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-			return getName();

+		switch (featureID) {

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

+				return getDescription();

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

+				return getName();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -172,18 +159,17 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-			setDescription((String)newValue);

-			return;

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-			setName((String)newValue);

-			return;

+		switch (featureID) {

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

+				setDescription((String)newValue);

+				return;

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

+				setName((String)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -191,18 +177,17 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-			setDescription(DESCRIPTION_EDEFAULT);

-			return;

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-			setName(NAME_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

+				setDescription(DESCRIPTION_EDEFAULT);

+				return;

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

+				setName(NAME_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -210,16 +195,15 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

-			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		switch (featureID) {

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION:

+				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -227,14 +211,12 @@ public abstract class TableNamedElementImpl extends StyledElementImpl implements
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (description: "); //$NON-NLS-1$

 		result.append(description);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
index 3a245ffd42b..42050b7d1c6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
@@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

  * @generated

  */

@@ -37,7 +36,6 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattableconfigurationPackage modelPackage;

@@ -46,11 +44,10 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableconfigurationAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattableconfigurationPackage.eINSTANCE;

 		}

 	}

@@ -60,16 +57,15 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

+		if (object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

@@ -79,44 +75,36 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NattableconfigurationSwitch<Adapter> modelSwitch = new NattableconfigurationSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseTableNamedElement(TableNamedElement object) {

-			return createTableNamedElementAdapter();

-		}

-

-		@Override

-		public Adapter caseTableConfiguration(TableConfiguration object) {

-			return createTableConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseEModelElement(EModelElement object) {

-			return createEModelElementAdapter();

-		}

-

-		@Override

-		public Adapter caseStyledElement(StyledElement object) {

-			return createStyledElementAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

+			@Override

+			public Adapter caseTableNamedElement(TableNamedElement object) {

+				return createTableNamedElementAdapter();

+			}

+			@Override

+			public Adapter caseTableConfiguration(TableConfiguration object) {

+				return createTableConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseEModelElement(EModelElement object) {

+				return createEModelElementAdapter();

+			}

+			@Override

+			public Adapter caseStyledElement(StyledElement object) {

+				return createStyledElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *        the object to adapt.

+	 * @param target the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -126,13 +114,11 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

-	 * <em>Table Named Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

 	 * @generated

@@ -142,13 +128,11 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>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.TableConfiguration

 	 * @generated

@@ -163,7 +147,6 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.ecore.EModelElement

 	 * @generated

@@ -173,13 +156,11 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * <em>Styled Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

 	 * @generated

@@ -193,7 +174,6 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
index b881afeb993..b1dd442682b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
@@ -30,7 +30,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

  * @generated

  */

@@ -40,7 +39,6 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattableconfigurationPackage modelPackage;

@@ -49,11 +47,10 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableconfigurationSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattableconfigurationPackage.eINSTANCE;

 		}

 	}

@@ -62,8 +59,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

+	 * @param ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

 	 */

@@ -76,48 +72,30 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT:

-		{

-			TableNamedElement tableNamedElement = (TableNamedElement)theEObject;

-			T result = caseTableNamedElement(tableNamedElement);

-			if(result == null) {

-				result = caseStyledElement(tableNamedElement);

-			}

-			if(result == null) {

-				result = caseEModelElement(tableNamedElement);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableconfigurationPackage.TABLE_CONFIGURATION:

-		{

-			TableConfiguration tableConfiguration = (TableConfiguration)theEObject;

-			T result = caseTableConfiguration(tableConfiguration);

-			if(result == null) {

-				result = caseTableNamedElement(tableConfiguration);

-			}

-			if(result == null) {

-				result = caseStyledElement(tableConfiguration);

+		switch (classifierID) {

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT: {

+				TableNamedElement tableNamedElement = (TableNamedElement)theEObject;

+				T result = caseTableNamedElement(tableNamedElement);

+				if (result == null) result = caseStyledElement(tableNamedElement);

+				if (result == null) result = caseEModelElement(tableNamedElement);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = caseEModelElement(tableConfiguration);

+			case NattableconfigurationPackage.TABLE_CONFIGURATION: {

+				TableConfiguration tableConfiguration = (TableConfiguration)theEObject;

+				T result = caseTableConfiguration(tableConfiguration);

+				if (result == null) result = caseTableNamedElement(tableConfiguration);

+				if (result == null) result = caseStyledElement(tableConfiguration);

+				if (result == null) result = caseEModelElement(tableConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -127,9 +105,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -144,9 +120,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Table Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -161,9 +135,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -178,9 +150,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -195,9 +165,7 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java
index 62f04725f78..1fd0793aab8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
  * <!-- begin-user-doc -->

  * The <b>Validator</b> for the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

  * @generated

  */

@@ -38,17 +37,14 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static final NattableconfigurationValidator INSTANCE = new NattableconfigurationValidator();

 

 	/**

-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic

-	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

 	 * @generated

@@ -59,7 +55,6 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;

@@ -68,7 +63,6 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

@@ -77,7 +71,6 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableconfigurationValidator() {

@@ -88,70 +81,49 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * Returns the package of this validator switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	protected EPackage getEPackage() {

-		return NattableconfigurationPackage.eINSTANCE;

+	  return NattableconfigurationPackage.eINSTANCE;

 	}

 

 	/**

 	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		switch(classifierID) {

-		case NattableconfigurationPackage.TABLE_NAMED_ELEMENT:

-			return validateTableNamedElement((TableNamedElement)value, diagnostics, context);

-		case NattableconfigurationPackage.TABLE_CONFIGURATION:

-			return validateTableConfiguration((TableConfiguration)value, diagnostics, context);

-		case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

-			return validateCellEditorDeclaration((CellEditorDeclaration)value, diagnostics, context);

-		default:

-			return true;

+		switch (classifierID) {

+			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT:

+				return validateTableNamedElement((TableNamedElement)value, diagnostics, context);

+			case NattableconfigurationPackage.TABLE_CONFIGURATION:

+				return validateTableConfiguration((TableConfiguration)value, diagnostics, context);

+			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

+				return validateCellEditorDeclaration((CellEditorDeclaration)value, diagnostics, context);

+			default:

+				return true;

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTableNamedElement(TableNamedElement tableNamedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if(!validate_NoCircularContainment(tableNamedElement, diagnostics, context)) {

-			return false;

-		}

+		if (!validate_NoCircularContainment(tableNamedElement, diagnostics, context)) return false;

 		boolean result = validate_EveryMultiplicityConforms(tableNamedElement, diagnostics, context);

-		if(result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(tableNamedElement, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(tableNamedElement, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(tableNamedElement, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(tableNamedElement, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_UniqueID(tableNamedElement, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(tableNamedElement, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(tableNamedElement, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateTableNamedElement_nonEmptyName(tableNamedElement, diagnostics, context);

-		}

+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(tableNamedElement, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(tableNamedElement, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(tableNamedElement, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(tableNamedElement, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_UniqueID(tableNamedElement, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(tableNamedElement, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(tableNamedElement, diagnostics, context);

+		if (result || diagnostics != null) result &= validateTableNamedElement_nonEmptyName(tableNamedElement, diagnostics, context);

 		return result;

 	}

 

@@ -159,7 +131,6 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * The cached validation expression for the nonEmptyName constraint of '<em>Table Named Element</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String TABLE_NAMED_ELEMENT__NON_EMPTY_NAME__EEXPRESSION = "not (name.oclIsUndefined() or name = '')"; //$NON-NLS-1$

@@ -168,65 +139,44 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * Validates the nonEmptyName constraint of '<em>Table Named Element</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTableNamedElement_nonEmptyName(TableNamedElement tableNamedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT, tableNamedElement, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"nonEmptyName", //$NON-NLS-1$

-			TABLE_NAMED_ELEMENT__NON_EMPTY_NAME__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattableconfigurationPackage.Literals.TABLE_NAMED_ELEMENT,

+				 tableNamedElement,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "nonEmptyName", //$NON-NLS-1$

+				 TABLE_NAMED_ELEMENT__NON_EMPTY_NAME__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTableConfiguration(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if(!validate_NoCircularContainment(tableConfiguration, diagnostics, context)) {

-			return false;

-		}

+		if (!validate_NoCircularContainment(tableConfiguration, diagnostics, context)) return false;

 		boolean result = validate_EveryMultiplicityConforms(tableConfiguration, diagnostics, context);

-		if(result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_UniqueID(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateTableNamedElement_nonEmptyName(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateTableConfiguration_defaultRowAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateTableConfiguration_defaultColumnAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateTableConfiguration_defaultAxisProvidersTypes(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateTableConfiguration_typeNonNullNonEmpty(tableConfiguration, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateTableConfiguration_iconPath(tableConfiguration, diagnostics, context);

-		}

+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_UniqueID(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateTableNamedElement_nonEmptyName(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateTableConfiguration_defaultRowAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateTableConfiguration_defaultColumnAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateTableConfiguration_defaultAxisProvidersTypes(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateTableConfiguration_typeNonNullNonEmpty(tableConfiguration, diagnostics, context);

+		if (result || diagnostics != null) result &= validateTableConfiguration_iconPath(tableConfiguration, diagnostics, context);

 		return result;

 	}

 

@@ -234,7 +184,6 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * The cached validation expression for the defaultRowAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION = "rowAxisProviders->includes(defaultRowAxisProvider)"; //$NON-NLS-1$

@@ -243,20 +192,27 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * Validates the defaultRowAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTableConfiguration_defaultRowAxisProviderExistsInCollection(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION, tableConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"defaultRowAxisProviderExistsInCollection", //$NON-NLS-1$

-			TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

+				 tableConfiguration,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "defaultRowAxisProviderExistsInCollection", //$NON-NLS-1$

+				 TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * The cached validation expression for the defaultColumnAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION = "columnAxisProviders->includes(defaultColumnAxisProvider)"; //$NON-NLS-1$

@@ -265,20 +221,27 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * Validates the defaultColumnAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTableConfiguration_defaultColumnAxisProviderExistsInCollection(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION, tableConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"defaultColumnAxisProviderExistsInCollection", //$NON-NLS-1$

-			TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

+				 tableConfiguration,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "defaultColumnAxisProviderExistsInCollection", //$NON-NLS-1$

+				 TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * The cached validation expression for the defaultAxisProvidersTypes constraint of '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String TABLE_CONFIGURATION__DEFAULT_AXIS_PROVIDERS_TYPES__EEXPRESSION = "not (defaultRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and defaultColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))"; //$NON-NLS-1$

@@ -287,20 +250,27 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * Validates the defaultAxisProvidersTypes constraint of '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTableConfiguration_defaultAxisProvidersTypes(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION, tableConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"defaultAxisProvidersTypes", //$NON-NLS-1$

-			TABLE_CONFIGURATION__DEFAULT_AXIS_PROVIDERS_TYPES__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

+				 tableConfiguration,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "defaultAxisProvidersTypes", //$NON-NLS-1$

+				 TABLE_CONFIGURATION__DEFAULT_AXIS_PROVIDERS_TYPES__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * The cached validation expression for the typeNonNullNonEmpty constraint of '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String TABLE_CONFIGURATION__TYPE_NON_NULL_NON_EMPTY__EEXPRESSION = "not (type.oclIsUndefined() or type = '')"; //$NON-NLS-1$

@@ -309,20 +279,27 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * Validates the typeNonNullNonEmpty constraint of '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTableConfiguration_typeNonNullNonEmpty(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION, tableConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"typeNonNullNonEmpty", //$NON-NLS-1$

-			TABLE_CONFIGURATION__TYPE_NON_NULL_NON_EMPTY__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

+				 tableConfiguration,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "typeNonNullNonEmpty", //$NON-NLS-1$

+				 TABLE_CONFIGURATION__TYPE_NON_NULL_NON_EMPTY__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * The cached validation expression for the iconPath constraint of '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String TABLE_CONFIGURATION__ICON_PATH__EEXPRESSION = "not (iconPath.oclIsUndefined() or iconPath = '')"; //$NON-NLS-1$

@@ -331,19 +308,26 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * Validates the iconPath constraint of '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTableConfiguration_iconPath(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION, tableConfiguration, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"iconPath", //$NON-NLS-1$

-			TABLE_CONFIGURATION__ICON_PATH__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

+				 tableConfiguration,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "iconPath", //$NON-NLS-1$

+				 TABLE_CONFIGURATION__ICON_PATH__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateCellEditorDeclaration(CellEditorDeclaration cellEditorDeclaration, DiagnosticChain diagnostics, Map<Object, Object> context) {

@@ -354,7 +338,6 @@ public class NattableconfigurationValidator extends EObjectValidator {
 	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
index 00774330e21..949d43003a5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
@@ -18,30 +18,25 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
  * <!-- end-user-doc -->

  *

  * <!-- begin-model-doc -->

- * LabelProviderConfiguration for Feature. In case of Feature. we have two display options :

- * <ul>

- * <li>display the icon of the feature</li>

- * <li>display the label of the feature</li>

- * <li>display the multiplicity of the feature</li>

- * <li>display the type of the feature</li>

- * <li>display the '/' for isDerived of the feature</li>

- * <li>display the name of the feature</li>

- * </ul>

+ * LabelProviderConfiguration for Feature. In case of Feature. we have two display options : 

+ * <ul><li>display the icon of the feature </li> 

+ * <li>display the label of the feature </li>

+ * <li>display the multiplicity of the feature </li>

+ * <li>display the type of the feature </li>

+ * <li>display the '/' for isDerived of the feature </li>

+ * <li>display the name of the feature </li>

+ *  </ul>

  * <!-- end-model-doc -->

  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display

- * Is Derived</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type

- * </em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>

- * Display Multiplicity</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name

- * </em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration()

  * @model

@@ -57,7 +52,6 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
 	 * <!-- begin-model-doc -->

 	 * If true, we will display the '/' for isDerived

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Display Is Derived</em>' attribute.

 	 * @see #setDisplayIsDerived(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayIsDerived()

@@ -67,14 +61,10 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
 	boolean isDisplayIsDerived();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived

-	 * <em>Display Is Derived</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Display Is Derived</em>' attribute.

+	 * @param value the new value of the '<em>Display Is Derived</em>' attribute.

 	 * @see #isDisplayIsDerived()

 	 * @generated

 	 */

@@ -88,7 +78,6 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
 	 * <!-- begin-model-doc -->

 	 * If true, we will display the typeof the feature

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Display Type</em>' attribute.

 	 * @see #setDisplayType(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayType()

@@ -98,14 +87,10 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
 	boolean isDisplayType();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType

-	 * <em>Display Type</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Display Type</em>' attribute.

+	 * @param value the new value of the '<em>Display Type</em>' attribute.

 	 * @see #isDisplayType()

 	 * @generated

 	 */

@@ -119,7 +104,6 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
 	 * <!-- begin-model-doc -->

 	 * If true, we will display the multiplicity of the feature

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Display Multiplicity</em>' attribute.

 	 * @see #setDisplayMultiplicity(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayMultiplicity()

@@ -129,14 +113,10 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
 	boolean isDisplayMultiplicity();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity

-	 * <em>Display Multiplicity</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Display Multiplicity</em>' attribute.

+	 * @param value the new value of the '<em>Display Multiplicity</em>' attribute.

 	 * @see #isDisplayMultiplicity()

 	 * @generated

 	 */

@@ -150,7 +130,6 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
 	 * <!-- begin-model-doc -->

 	 * If true, we will display the name of the feature

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Display Name</em>' attribute.

 	 * @see #setDisplayName(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayName()

@@ -160,14 +139,10 @@ public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderCo
 	boolean isDisplayName();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName

-	 * <em>Display Name</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Display Name</em>' attribute.

+	 * @param value the new value of the '<em>Display Name</em>' attribute.

 	 * @see #isDisplayName()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
index 488328fe3f6..3c22bcc6cf5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage

  * @generated

  */

@@ -29,7 +28,6 @@ public interface NattablelabelproviderFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattablelabelproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderFactoryImpl.init();

@@ -38,7 +36,6 @@ public interface NattablelabelproviderFactory extends EFactory {
 	 * Returns a new object of class '<em>Feature Label Provider Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Feature Label Provider Configuration</em>'.

 	 * @generated

 	 */

@@ -48,17 +45,24 @@ public interface NattablelabelproviderFactory extends EFactory {
 	 * Returns a new object of class '<em>Object Label Provider Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Object Label Provider Configuration</em>'.

 	 * @generated

 	 */

 	ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration();

 

 	/**

+	 * Returns a new object of class '<em>Operation Label Provider Configuration</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Operation Label Provider Configuration</em>'.

+	 * @generated

+	 */

+	OperationLabelProviderConfiguration createOperationLabelProviderConfiguration();

+

+	/**

 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
index 3428adc55e6..7807099c069 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory

  * @model kind="package"

  * @generated

@@ -40,7 +39,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNAME = "nattablelabelprovider"; //$NON-NLS-1$

@@ -49,7 +47,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"; //$NON-NLS-1$

@@ -58,7 +55,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "nattablelabelprovider"; //$NON-NLS-1$

@@ -67,17 +63,14 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattablelabelproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration

-	 * <em>ILabel Provider Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getILabelProviderConfiguration()

 	 * @generated

@@ -88,7 +81,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -98,7 +90,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -108,7 +99,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The number of structural features of the '<em>ILabel Provider Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -118,7 +108,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -128,7 +117,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -138,7 +126,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -148,7 +135,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -158,19 +144,15 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The number of operations of the '<em>ILabel Provider Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int ILABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl

-	 * <em>Object Label Provider Configuration</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()

 	 * @generated

@@ -181,7 +163,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -191,7 +172,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -201,7 +181,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -211,7 +190,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -221,7 +199,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The number of structural features of the '<em>Object Label Provider Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -231,7 +208,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -241,7 +217,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -251,7 +226,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -261,7 +235,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -271,19 +244,15 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The number of operations of the '<em>Object Label Provider Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = ILABEL_PROVIDER_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.

+	 * 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

@@ -294,7 +263,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -304,7 +272,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -314,7 +281,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -324,7 +290,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -334,7 +299,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Is Derived</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -344,7 +308,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Type</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -354,7 +317,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Multiplicity</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -364,7 +326,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The feature id for the '<em><b>Display Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -374,7 +335,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The number of structural features of the '<em>Feature Label Provider Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -384,7 +344,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -394,7 +353,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -404,7 +362,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -414,7 +371,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -424,18 +380,142 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * The number of operations of the '<em>Feature Label Provider Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int FEATURE_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration

-	 * <em>ILabel Provider Configuration</em>}'.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl <em>Operation Label Provider Configuration</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getOperationLabelProviderConfiguration()

+	 * @generated

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION = 3;

+

+	/**

+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;

+

+	/**

+	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__STYLES = OBJECT_LABEL_PROVIDER_CONFIGURATION__STYLES;

+

+	/**

+	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON;

+

+	/**

+	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL;

+

+	/**

+	 * The feature id for the '<em><b>Display Type</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Display Multiplicity</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Display Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;

+

+	/**

+	 * The number of structural features of the '<em>Operation Label Provider Configuration</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 3;

+

+	/**

+	 * The operation id for the '<em>Get EAnnotation</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING;

+

+	/**

+	 * The operation id for the '<em>Get Named Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_NAMED_STYLE__ECLASS_STRING;

+

+	/**

+	 * The operation id for the '<em>Get Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_STYLE__ECLASS;

+

+	/**

+	 * The operation id for the '<em>Create Style</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS = OBJECT_LABEL_PROVIDER_CONFIGURATION___CREATE_STYLE__ECLASS;

+

+	/**

+	 * The number of operations of the '<em>Operation Label Provider Configuration</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int OPERATION_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>ILabel Provider Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration

 	 * @generated

@@ -443,12 +523,9 @@ public interface NattablelabelproviderPackage extends EPackage {
 	EClass getILabelProviderConfiguration();

 

 	/**

-	 * Returns the meta object for class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration

-	 * <em>Feature Label Provider Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Feature Label Provider Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration

 	 * @generated

@@ -456,12 +533,9 @@ public interface NattablelabelproviderPackage extends EPackage {
 	EClass getFeatureLabelProviderConfiguration();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived

-	 * <em>Display Is Derived</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Display Is Derived</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived()

 	 * @see #getFeatureLabelProviderConfiguration()

@@ -470,12 +544,9 @@ public interface NattablelabelproviderPackage extends EPackage {
 	EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType

-	 * <em>Display Type</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Display Type</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType()

 	 * @see #getFeatureLabelProviderConfiguration()

@@ -484,12 +555,9 @@ public interface NattablelabelproviderPackage extends EPackage {
 	EAttribute getFeatureLabelProviderConfiguration_DisplayType();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity

-	 * <em>Display Multiplicity</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Display Multiplicity</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity()

 	 * @see #getFeatureLabelProviderConfiguration()

@@ -498,12 +566,9 @@ public interface NattablelabelproviderPackage extends EPackage {
 	EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName

-	 * <em>Display Name</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Display Name</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName()

 	 * @see #getFeatureLabelProviderConfiguration()

@@ -512,12 +577,9 @@ public interface NattablelabelproviderPackage extends EPackage {
 	EAttribute getFeatureLabelProviderConfiguration_DisplayName();

 

 	/**

-	 * Returns the meta object for class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration

-	 * <em>Object Label Provider Configuration</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Object Label Provider Configuration</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration

 	 * @generated

@@ -525,12 +587,9 @@ public interface NattablelabelproviderPackage extends EPackage {
 	EClass getObjectLabelProviderConfiguration();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#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.ObjectLabelProviderConfiguration#isDisplayIcon()

 	 * @see #getObjectLabelProviderConfiguration()

@@ -539,12 +598,9 @@ public interface NattablelabelproviderPackage extends EPackage {
 	EAttribute getObjectLabelProviderConfiguration_DisplayIcon();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel

-	 * <em>Display Label</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Display Label</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel()

 	 * @see #getObjectLabelProviderConfiguration()

@@ -553,10 +609,52 @@ public interface NattablelabelproviderPackage extends EPackage {
 	EAttribute getObjectLabelProviderConfiguration_DisplayLabel();

 

 	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration <em>Operation Label Provider Configuration</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Operation Label Provider Configuration</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration

+	 * @generated

+	 */

+	EClass getOperationLabelProviderConfiguration();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType <em>Display Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Display Type</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType()

+	 * @see #getOperationLabelProviderConfiguration()

+	 * @generated

+	 */

+	EAttribute getOperationLabelProviderConfiguration_DisplayType();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Display Multiplicity</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity()

+	 * @see #getOperationLabelProviderConfiguration()

+	 * @generated

+	 */

+	EAttribute getOperationLabelProviderConfiguration_DisplayMultiplicity();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName <em>Display Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Display Name</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName()

+	 * @see #getOperationLabelProviderConfiguration()

+	 * @generated

+	 */

+	EAttribute getOperationLabelProviderConfiguration_DisplayName();

+

+	/**

 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -573,18 +671,14 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	interface Literals {

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration

-		 * <em>ILabel Provider Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel Provider Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getILabelProviderConfiguration()

 		 * @generated

@@ -592,12 +686,9 @@ public interface NattablelabelproviderPackage extends EPackage {
 		EClass ILABEL_PROVIDER_CONFIGURATION = eINSTANCE.getILabelProviderConfiguration();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl

-		 * <em>Feature Label Provider Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl <em>Feature Label Provider Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getFeatureLabelProviderConfiguration()

 		 * @generated

@@ -608,7 +699,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Display Is Derived</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();

@@ -617,7 +707,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Display Type</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();

@@ -626,7 +715,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Display Multiplicity</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();

@@ -635,18 +723,14 @@ public interface NattablelabelproviderPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl

-		 * <em>Object Label Provider Configuration</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()

 		 * @generated

@@ -657,7 +741,6 @@ public interface NattablelabelproviderPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Display Icon</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();

@@ -666,9 +749,42 @@ public interface NattablelabelproviderPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Display Label</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl <em>Operation Label Provider Configuration</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getOperationLabelProviderConfiguration()

+		 * @generated

+		 */

+		EClass OPERATION_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getOperationLabelProviderConfiguration();

+

+		/**

+		 * The meta object literal for the '<em><b>Display Type</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = eINSTANCE.getOperationLabelProviderConfiguration_DisplayType();

+

+		/**

+		 * The meta object literal for the '<em><b>Display Multiplicity</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = eINSTANCE.getOperationLabelProviderConfiguration_DisplayMultiplicity();

+

+		/**

+		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = eINSTANCE.getOperationLabelProviderConfiguration_DisplayName();

 	}

 } // NattablelabelproviderPackage

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
index e7d96b17b3e..b63c9832a92 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
@@ -18,22 +18,18 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
  * <!-- end-user-doc -->

  *

  * <!-- begin-model-doc -->

- * LabelProviderConfiguration for Object. In case of Object we have two display options :

- * <ul>

- * <li>display the icon of the object</li>

- * <li>display the label of the object</li>

- * </ul>

+ * LabelProviderConfiguration for Object. In case of Object we have two display options : 

+ * <ul><li>display the icon of the object</li> 

+ * <li>display the label of the object</li> </ul>

  * <!-- end-model-doc -->

  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon

- * </em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display

- * Label</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration()

  * @model

@@ -49,7 +45,6 @@ public interface ObjectLabelProviderConfiguration extends ILabelProviderConfigur
 	 * <!-- begin-model-doc -->

 	 * If true, we will display the icon of the object

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Display Icon</em>' attribute.

 	 * @see #setDisplayIcon(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration_DisplayIcon()

@@ -59,14 +54,10 @@ public interface ObjectLabelProviderConfiguration extends ILabelProviderConfigur
 	boolean isDisplayIcon();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#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.

+	 * @param value the new value of the '<em>Display Icon</em>' attribute.

 	 * @see #isDisplayIcon()

 	 * @generated

 	 */

@@ -80,7 +71,6 @@ public interface ObjectLabelProviderConfiguration extends ILabelProviderConfigur
 	 * <!-- begin-model-doc -->

 	 * If true, we will display the label of the object

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Display Label</em>' attribute.

 	 * @see #setDisplayLabel(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration_DisplayLabel()

@@ -90,14 +80,10 @@ public interface ObjectLabelProviderConfiguration extends ILabelProviderConfigur
 	boolean isDisplayLabel();

 

 	/**

-	 * Sets the value of the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#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.

+	 * @param value the new value of the '<em>Display Label</em>' attribute.

 	 * @see #isDisplayLabel()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/OperationLabelProviderConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/OperationLabelProviderConfiguration.java
new file mode 100644
index 00000000000..68e146d7678
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/OperationLabelProviderConfiguration.java
@@ -0,0 +1,127 @@
+/**

+ * Copyright (c) 2013 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ */

+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Operation Label Provider Configuration</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <!-- begin-model-doc -->

+ * LabelProviderConfiguration for Operation. In case of Operation, we have four display options : 

+ * <ul><li>display the icon of the Operation</li> 

+ * <li>display the label of the Operation</li>

+ * <li>display the multiplicity of the Operation</li>

+ * <li>display the type of the Operation</li>

+ * <li>display the '/' for isDerived of the feature </li>

+ * <li>display the name of the feature </li>

+ *  </ul>

+ * <!-- end-model-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType <em>Display Type</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName <em>Display Name</em>}</li>

+ * </ul>

+ *

+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration()

+ * @model

+ * @generated

+ */

+public interface OperationLabelProviderConfiguration extends ObjectLabelProviderConfiguration {

+	/**

+	 * Returns the value of the '<em><b>Display Type</b></em>' attribute.

+	 * The default value is <code>"true"</code>.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Display Type</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Display Type</em>' attribute.

+	 * @see #setDisplayType(boolean)

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration_DisplayType()

+	 * @model default="true" required="true"

+	 * @generated

+	 */

+	boolean isDisplayType();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayType <em>Display Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Display Type</em>' attribute.

+	 * @see #isDisplayType()

+	 * @generated

+	 */

+	void setDisplayType(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Display Multiplicity</b></em>' attribute.

+	 * The default value is <code>"true"</code>.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Display Multiplicity</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Display Multiplicity</em>' attribute.

+	 * @see #setDisplayMultiplicity(boolean)

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration_DisplayMultiplicity()

+	 * @model default="true" required="true"

+	 * @generated

+	 */

+	boolean isDisplayMultiplicity();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Display Multiplicity</em>' attribute.

+	 * @see #isDisplayMultiplicity()

+	 * @generated

+	 */

+	void setDisplayMultiplicity(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.

+	 * The default value is <code>"true"</code>.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Display Name</em>' attribute.

+	 * @see #setDisplayName(boolean)

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getOperationLabelProviderConfiguration_DisplayName()

+	 * @model default="true" required="true"

+	 * @generated

+	 */

+	boolean isDisplayName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration#isDisplayName <em>Display Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Display Name</em>' attribute.

+	 * @see #isDisplayName()

+	 * @generated

+	 */

+	void setDisplayName(boolean value);

+

+} // OperationLabelProviderConfiguration

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
index 8b409e02873..3a9b9986449 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
@@ -24,18 +24,13 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayIsDerived

- * <em>Display Is Derived</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayType <em>

- * Display Type</em>}</li>

- * <li>

- * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayMultiplicity

- * <em>Display Multiplicity</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayName <em>

- * Display Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayIsDerived <em>Display Is Derived</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayType <em>Display Type</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayName <em>Display Name</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -45,7 +40,6 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	 * The default value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayIsDerived()

 	 * @generated

 	 * @ordered

@@ -56,7 +50,6 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	 * The cached value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayIsDerived()

 	 * @generated

 	 * @ordered

@@ -67,7 +60,6 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	 * The default value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayType()

 	 * @generated

 	 * @ordered

@@ -78,7 +70,6 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	 * The cached value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayType()

 	 * @generated

 	 * @ordered

@@ -89,7 +80,6 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	 * The default value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayMultiplicity()

 	 * @generated

 	 * @ordered

@@ -100,7 +90,6 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	 * The cached value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayMultiplicity()

 	 * @generated

 	 * @ordered

@@ -111,7 +100,6 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	 * The default value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayName()

 	 * @generated

 	 * @ordered

@@ -122,7 +110,6 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	 * The cached value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayName()

 	 * @generated

 	 * @ordered

@@ -132,7 +119,6 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected FeatureLabelProviderConfigurationImpl() {

@@ -142,7 +128,6 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -153,7 +138,6 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -164,22 +148,19 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDisplayIsDerived(boolean newDisplayIsDerived) {

 		boolean oldDisplayIsDerived = displayIsDerived;

 		displayIsDerived = newDisplayIsDerived;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED, oldDisplayIsDerived, displayIsDerived));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -190,22 +171,19 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDisplayType(boolean newDisplayType) {

 		boolean oldDisplayType = displayType;

 		displayType = newDisplayType;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE, oldDisplayType, displayType));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -216,22 +194,19 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDisplayMultiplicity(boolean newDisplayMultiplicity) {

 		boolean oldDisplayMultiplicity = displayMultiplicity;

 		displayMultiplicity = newDisplayMultiplicity;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY, oldDisplayMultiplicity, displayMultiplicity));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -242,35 +217,32 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDisplayName(boolean newDisplayName) {

 		boolean oldDisplayName = displayName;

 		displayName = newDisplayName;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME, oldDisplayName, displayName));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-			return isDisplayIsDerived();

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-			return isDisplayType();

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-			return isDisplayMultiplicity();

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-			return isDisplayName();

+		switch (featureID) {

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

+				return isDisplayIsDerived();

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

+				return isDisplayType();

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

+				return isDisplayMultiplicity();

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

+				return isDisplayName();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -278,24 +250,23 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-			setDisplayIsDerived((Boolean)newValue);

-			return;

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-			setDisplayType((Boolean)newValue);

-			return;

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-			setDisplayMultiplicity((Boolean)newValue);

-			return;

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-			setDisplayName((Boolean)newValue);

-			return;

+		switch (featureID) {

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

+				setDisplayIsDerived((Boolean)newValue);

+				return;

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

+				setDisplayType((Boolean)newValue);

+				return;

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

+				setDisplayMultiplicity((Boolean)newValue);

+				return;

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

+				setDisplayName((Boolean)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -303,24 +274,23 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-			setDisplayIsDerived(DISPLAY_IS_DERIVED_EDEFAULT);

-			return;

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-			setDisplayType(DISPLAY_TYPE_EDEFAULT);

-			return;

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-			setDisplayMultiplicity(DISPLAY_MULTIPLICITY_EDEFAULT);

-			return;

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-			setDisplayName(DISPLAY_NAME_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

+				setDisplayIsDerived(DISPLAY_IS_DERIVED_EDEFAULT);

+				return;

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

+				setDisplayType(DISPLAY_TYPE_EDEFAULT);

+				return;

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

+				setDisplayMultiplicity(DISPLAY_MULTIPLICITY_EDEFAULT);

+				return;

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

+				setDisplayName(DISPLAY_NAME_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -328,20 +298,19 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

-			return displayIsDerived != DISPLAY_IS_DERIVED_EDEFAULT;

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

-			return displayType != DISPLAY_TYPE_EDEFAULT;

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

-			return displayMultiplicity != DISPLAY_MULTIPLICITY_EDEFAULT;

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

-			return displayName != DISPLAY_NAME_EDEFAULT;

+		switch (featureID) {

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:

+				return displayIsDerived != DISPLAY_IS_DERIVED_EDEFAULT;

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

+				return displayType != DISPLAY_TYPE_EDEFAULT;

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

+				return displayMultiplicity != DISPLAY_MULTIPLICITY_EDEFAULT;

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

+				return displayName != DISPLAY_NAME_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -349,14 +318,12 @@ public class FeatureLabelProviderConfigurationImpl extends ObjectLabelProviderCo
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (displayIsDerived: "); //$NON-NLS-1$

 		result.append(displayIsDerived);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
index 615a5b4fc46..7ad87372dcb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

@@ -26,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.O
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements NattablelabelproviderFactory {

@@ -35,16 +35,16 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static NattablelabelproviderFactory init() {

 		try {

 			NattablelabelproviderFactory theNattablelabelproviderFactory = (NattablelabelproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattablelabelproviderPackage.eNS_URI);

-			if(theNattablelabelproviderFactory != null) {

+			if (theNattablelabelproviderFactory != null) {

 				return theNattablelabelproviderFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new NattablelabelproviderFactoryImpl();

@@ -54,7 +54,6 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattablelabelproviderFactoryImpl() {

@@ -64,25 +63,22 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION:

-			return createFeatureLabelProviderConfiguration();

-		case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION:

-			return createObjectLabelProviderConfiguration();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eClass.getClassifierID()) {

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: return createFeatureLabelProviderConfiguration();

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: return createObjectLabelProviderConfiguration();

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION: return createOperationLabelProviderConfiguration();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -94,7 +90,6 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -106,7 +101,16 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @generated

+	 */

+	public OperationLabelProviderConfiguration createOperationLabelProviderConfiguration() {

+		OperationLabelProviderConfigurationImpl operationLabelProviderConfiguration = new OperationLabelProviderConfigurationImpl();

+		return operationLabelProviderConfiguration;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

@@ -117,7 +121,6 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
index a787a84cdc8..6ce35027d72 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
@@ -34,6 +34,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.I
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;

@@ -45,7 +46,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattablelabelproviderPackageImpl extends EPackageImpl implements NattablelabelproviderPackage {

@@ -53,7 +53,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass iLabelProviderConfigurationEClass = null;

@@ -61,7 +60,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass featureLabelProviderConfigurationEClass = null;

@@ -69,19 +67,26 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass objectLabelProviderConfigurationEClass = null;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass operationLabelProviderConfigurationEClass = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

 	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#eNS_URI

 	 * @see #init()

@@ -94,32 +99,32 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link NattablelabelproviderPackage#eINSTANCE} when that field is accessed. Clients should not invoke it

-	 * directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * 

+	 * <p>This method is used to initialize {@link NattablelabelproviderPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static NattablelabelproviderPackage init() {

-		if(isInited) {

-			return (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);

-		}

+		if (isInited) return (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);

+

 		// Obtain or create and register package

 		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablelabelproviderPackageImpl());

+

 		isInited = true;

+

 		// Initialize simple dependencies

 		EcorePackage.eINSTANCE.eClass();

+

 		// Obtain or create and register interdependencies

 		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

 		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

@@ -130,6 +135,7 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

 		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

 		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

+

 		// Create package meta-data objects

 		theNattablelabelproviderPackage.createPackageContents();

 		theNattablePackage.createPackageContents();

@@ -141,6 +147,7 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 		theNattablecellPackage.createPackageContents();

 		theNattableproblemPackage.createPackageContents();

 		theNattablestylePackage.createPackageContents();

+

 		// Initialize created meta-data

 		theNattablelabelproviderPackage.initializePackageContents();

 		theNattablePackage.initializePackageContents();

@@ -152,8 +159,11 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 		theNattablecellPackage.initializePackageContents();

 		theNattableproblemPackage.initializePackageContents();

 		theNattablestylePackage.initializePackageContents();

+

 		// Mark meta-data to indicate it can't be changed

 		theNattablelabelproviderPackage.freeze();

+

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(NattablelabelproviderPackage.eNS_URI, theNattablelabelproviderPackage);

 		return theNattablelabelproviderPackage;

@@ -162,7 +172,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -173,7 +182,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -184,7 +192,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -195,7 +202,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -206,7 +212,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -217,7 +222,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -228,7 +232,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -239,7 +242,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -250,7 +252,6 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -261,7 +262,42 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @generated

+	 */

+	public EClass getOperationLabelProviderConfiguration() {

+		return operationLabelProviderConfigurationEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getOperationLabelProviderConfiguration_DisplayType() {

+		return (EAttribute)operationLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getOperationLabelProviderConfiguration_DisplayMultiplicity() {

+		return (EAttribute)operationLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getOperationLabelProviderConfiguration_DisplayName() {

+		return (EAttribute)operationLabelProviderConfigurationEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

@@ -272,78 +308,92 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package. This method is

+	 * Creates the meta-model objects for the package.  This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated) {

-			return;

-		}

+		if (isCreated) return;

 		isCreated = true;

+

 		// Create classes and their features

 		iLabelProviderConfigurationEClass = createEClass(ILABEL_PROVIDER_CONFIGURATION);

+

 		featureLabelProviderConfigurationEClass = createEClass(FEATURE_LABEL_PROVIDER_CONFIGURATION);

 		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED);

 		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE);

 		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY);

 		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME);

+

 		objectLabelProviderConfigurationEClass = createEClass(OBJECT_LABEL_PROVIDER_CONFIGURATION);

 		createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON);

 		createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL);

+

+		operationLabelProviderConfigurationEClass = createEClass(OPERATION_LABEL_PROVIDER_CONFIGURATION);

+		createEAttribute(operationLabelProviderConfigurationEClass, OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE);

+		createEAttribute(operationLabelProviderConfigurationEClass, OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY);

+		createEAttribute(operationLabelProviderConfigurationEClass, OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME);

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model. This

+	 * Complete the initialization of the package and its meta-model.  This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized) {

-			return;

-		}

+		if (isInitialized) return;

 		isInitialized = true;

+

 		// Initialize package

 		setName(eNAME);

 		setNsPrefix(eNS_PREFIX);

 		setNsURI(eNS_URI);

+

 		// Obtain other dependent packages

 		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

+

 		// Create type parameters

+

 		// Set bounds for type parameters

+

 		// Add supertypes to classes

 		iLabelProviderConfigurationEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());

 		featureLabelProviderConfigurationEClass.getESuperTypes().add(this.getObjectLabelProviderConfiguration());

 		objectLabelProviderConfigurationEClass.getESuperTypes().add(this.getILabelProviderConfiguration());

+		operationLabelProviderConfigurationEClass.getESuperTypes().add(this.getObjectLabelProviderConfiguration());

+

 		// Initialize classes, features, and operations; add parameters

 		initEClass(iLabelProviderConfigurationEClass, ILabelProviderConfiguration.class, "ILabelProviderConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(featureLabelProviderConfigurationEClass, FeatureLabelProviderConfiguration.class, "FeatureLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getFeatureLabelProviderConfiguration_DisplayIsDerived(), ecorePackage.getEBoolean(), "displayIsDerived", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

 		initEAttribute(getFeatureLabelProviderConfiguration_DisplayType(), ecorePackage.getEBoolean(), "displayType", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

 		initEAttribute(getFeatureLabelProviderConfiguration_DisplayMultiplicity(), ecorePackage.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(), ecorePackage.getEBoolean(), "displayName", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

+

 		initEClass(objectLabelProviderConfigurationEClass, ObjectLabelProviderConfiguration.class, "ObjectLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getObjectLabelProviderConfiguration_DisplayIcon(), ecorePackage.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(), ecorePackage.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$

+

+		initEClass(operationLabelProviderConfigurationEClass, OperationLabelProviderConfiguration.class, "OperationLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+		initEAttribute(getOperationLabelProviderConfiguration_DisplayType(), ecorePackage.getEBoolean(), "displayType", "true", 1, 1, OperationLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

+		initEAttribute(getOperationLabelProviderConfiguration_DisplayMultiplicity(), ecorePackage.getEBoolean(), "displayMultiplicity", "true", 1, 1, OperationLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

+		initEAttribute(getOperationLabelProviderConfiguration_DisplayName(), ecorePackage.getEBoolean(), "displayName", "true", 1, 1, OperationLabelProviderConfiguration.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/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
index fb361c96b5b..14cef53d024 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
@@ -25,13 +25,11 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.Styl
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <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>

+ *   <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

  */

@@ -41,7 +39,6 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	 * The default value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayIcon()

 	 * @generated

 	 * @ordered

@@ -52,7 +49,6 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	 * The cached value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayIcon()

 	 * @generated

 	 * @ordered

@@ -63,7 +59,6 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayLabel()

 	 * @generated

 	 * @ordered

@@ -74,7 +69,6 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isDisplayLabel()

 	 * @generated

 	 * @ordered

@@ -84,7 +78,6 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ObjectLabelProviderConfigurationImpl() {

@@ -94,7 +87,6 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -105,7 +97,6 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -116,22 +107,19 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDisplayIcon(boolean newDisplayIcon) {

 		boolean oldDisplayIcon = displayIcon;

 		displayIcon = newDisplayIcon;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON, oldDisplayIcon, displayIcon));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -142,31 +130,28 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDisplayLabel(boolean newDisplayLabel) {

 		boolean oldDisplayLabel = displayLabel;

 		displayLabel = newDisplayLabel;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-			return isDisplayIcon();

-		case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-			return isDisplayLabel();

+		switch (featureID) {

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

+				return isDisplayIcon();

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

+				return isDisplayLabel();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -174,18 +159,17 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-			setDisplayIcon((Boolean)newValue);

-			return;

-		case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-			setDisplayLabel((Boolean)newValue);

-			return;

+		switch (featureID) {

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

+				setDisplayIcon((Boolean)newValue);

+				return;

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

+				setDisplayLabel((Boolean)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -193,18 +177,17 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-			setDisplayIcon(DISPLAY_ICON_EDEFAULT);

-			return;

-		case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-			setDisplayLabel(DISPLAY_LABEL_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

+				setDisplayIcon(DISPLAY_ICON_EDEFAULT);

+				return;

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

+				setDisplayLabel(DISPLAY_LABEL_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -212,16 +195,15 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-			return displayIcon != DISPLAY_ICON_EDEFAULT;

-		case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

-			return displayLabel != DISPLAY_LABEL_EDEFAULT;

+		switch (featureID) {

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

+				return displayIcon != DISPLAY_ICON_EDEFAULT;

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

+				return displayLabel != DISPLAY_LABEL_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -229,14 +211,12 @@ public class ObjectLabelProviderConfigurationImpl extends StyledElementImpl impl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (displayIcon: "); //$NON-NLS-1$

 		result.append(displayIcon);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/OperationLabelProviderConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/OperationLabelProviderConfigurationImpl.java
new file mode 100644
index 00000000000..d203bb6103e
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/OperationLabelProviderConfigurationImpl.java
@@ -0,0 +1,280 @@
+/**

+ * Copyright (c) 2013 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ */

+package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Operation Label Provider Configuration</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl#isDisplayType <em>Display Type</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.OperationLabelProviderConfigurationImpl#isDisplayName <em>Display Name</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class OperationLabelProviderConfigurationImpl extends ObjectLabelProviderConfigurationImpl implements OperationLabelProviderConfiguration {

+	/**

+	 * The default value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isDisplayType()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean DISPLAY_TYPE_EDEFAULT = true;

+

+	/**

+	 * The cached value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isDisplayType()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean displayType = DISPLAY_TYPE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isDisplayMultiplicity()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean DISPLAY_MULTIPLICITY_EDEFAULT = true;

+

+	/**

+	 * The cached value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isDisplayMultiplicity()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean displayMultiplicity = DISPLAY_MULTIPLICITY_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isDisplayName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean DISPLAY_NAME_EDEFAULT = true;

+

+	/**

+	 * The cached value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isDisplayName()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean displayName = DISPLAY_NAME_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected OperationLabelProviderConfigurationImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return NattablelabelproviderPackage.Literals.OPERATION_LABEL_PROVIDER_CONFIGURATION;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isDisplayType() {

+		return displayType;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setDisplayType(boolean newDisplayType) {

+		boolean oldDisplayType = displayType;

+		displayType = newDisplayType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE, oldDisplayType, displayType));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isDisplayMultiplicity() {

+		return displayMultiplicity;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setDisplayMultiplicity(boolean newDisplayMultiplicity) {

+		boolean oldDisplayMultiplicity = displayMultiplicity;

+		displayMultiplicity = newDisplayMultiplicity;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY, oldDisplayMultiplicity, displayMultiplicity));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isDisplayName() {

+		return displayName;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setDisplayName(boolean newDisplayName) {

+		boolean oldDisplayName = displayName;

+		displayName = newDisplayName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME, oldDisplayName, displayName));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

+				return isDisplayType();

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

+				return isDisplayMultiplicity();

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

+				return isDisplayName();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

+				setDisplayType((Boolean)newValue);

+				return;

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

+				setDisplayMultiplicity((Boolean)newValue);

+				return;

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

+				setDisplayName((Boolean)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

+				setDisplayType(DISPLAY_TYPE_EDEFAULT);

+				return;

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

+				setDisplayMultiplicity(DISPLAY_MULTIPLICITY_EDEFAULT);

+				return;

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

+				setDisplayName(DISPLAY_NAME_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:

+				return displayType != DISPLAY_TYPE_EDEFAULT;

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:

+				return displayMultiplicity != DISPLAY_MULTIPLICITY_EDEFAULT;

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:

+				return displayName != DISPLAY_NAME_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (displayType: "); //$NON-NLS-1$

+		result.append(displayType);

+		result.append(", displayMultiplicity: "); //$NON-NLS-1$

+		result.append(displayMultiplicity);

+		result.append(", displayName: "); //$NON-NLS-1$

+		result.append(displayName);

+		result.append(')');

+		return result.toString();

+	}

+

+} //OperationLabelProviderConfigurationImpl

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
index b7ce343d4ff..ebb6f3806c7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

@@ -28,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage

  * @generated

  */

@@ -38,7 +38,6 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattablelabelproviderPackage modelPackage;

@@ -47,11 +46,10 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattablelabelproviderAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattablelabelproviderPackage.eINSTANCE;

 		}

 	}

@@ -61,16 +59,15 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

+		if (object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

@@ -80,49 +77,44 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NattablelabelproviderSwitch<Adapter> modelSwitch = new NattablelabelproviderSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseILabelProviderConfiguration(ILabelProviderConfiguration object) {

-			return createILabelProviderConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {

-			return createFeatureLabelProviderConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {

-			return createObjectLabelProviderConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseEModelElement(EModelElement object) {

-			return createEModelElementAdapter();

-		}

-

-		@Override

-		public Adapter caseStyledElement(StyledElement object) {

-			return createStyledElementAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

+			@Override

+			public Adapter caseILabelProviderConfiguration(ILabelProviderConfiguration object) {

+				return createILabelProviderConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {

+				return createFeatureLabelProviderConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {

+				return createObjectLabelProviderConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseOperationLabelProviderConfiguration(OperationLabelProviderConfiguration object) {

+				return createOperationLabelProviderConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseEModelElement(EModelElement object) {

+				return createEModelElementAdapter();

+			}

+			@Override

+			public Adapter caseStyledElement(StyledElement object) {

+				return createStyledElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *        the object to adapt.

+	 * @param target the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -132,14 +124,11 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration

-	 * <em>ILabel Provider Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration <em>ILabel 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.ILabelProviderConfiguration

 	 * @generated

@@ -149,14 +138,11 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration

-	 * <em>Feature Label Provider Configuration</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration

 	 * @generated

@@ -166,14 +152,11 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * 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>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration

 	 * @generated

@@ -183,12 +166,25 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.OperationLabelProviderConfiguration <em>Operation 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.OperationLabelProviderConfiguration

+	 * @generated

+	 */

+	public Adapter createOperationLabelProviderConfigurationAdapter() {

+		return null;

+	}

+

+	/**

 	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.ecore.EModelElement

 	 * @generated

@@ -198,13 +194,11 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * <em>Styled Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

 	 * @generated

@@ -218,7 +212,6 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
index 3d1fb528c48..7c8fe7e82fa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.util.Switch;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

@@ -31,7 +32,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage

  * @generated

  */

@@ -41,7 +41,6 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattablelabelproviderPackage modelPackage;

@@ -50,11 +49,10 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattablelabelproviderSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattablelabelproviderPackage.eINSTANCE;

 		}

 	}

@@ -63,8 +61,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

+	 * @param ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

 	 */

@@ -77,69 +74,50 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case NattablelabelproviderPackage.ILABEL_PROVIDER_CONFIGURATION:

-		{

-			ILabelProviderConfiguration iLabelProviderConfiguration = (ILabelProviderConfiguration)theEObject;

-			T result = caseILabelProviderConfiguration(iLabelProviderConfiguration);

-			if(result == null) {

-				result = caseStyledElement(iLabelProviderConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(iLabelProviderConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION:

-		{

-			FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)theEObject;

-			T result = caseFeatureLabelProviderConfiguration(featureLabelProviderConfiguration);

-			if(result == null) {

-				result = caseObjectLabelProviderConfiguration(featureLabelProviderConfiguration);

-			}

-			if(result == null) {

-				result = caseILabelProviderConfiguration(featureLabelProviderConfiguration);

+		switch (classifierID) {

+			case NattablelabelproviderPackage.ILABEL_PROVIDER_CONFIGURATION: {

+				ILabelProviderConfiguration iLabelProviderConfiguration = (ILabelProviderConfiguration)theEObject;

+				T result = caseILabelProviderConfiguration(iLabelProviderConfiguration);

+				if (result == null) result = caseStyledElement(iLabelProviderConfiguration);

+				if (result == null) result = caseEModelElement(iLabelProviderConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = caseStyledElement(featureLabelProviderConfiguration);

+			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: {

+				FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)theEObject;

+				T result = caseFeatureLabelProviderConfiguration(featureLabelProviderConfiguration);

+				if (result == null) result = caseObjectLabelProviderConfiguration(featureLabelProviderConfiguration);

+				if (result == null) result = caseILabelProviderConfiguration(featureLabelProviderConfiguration);

+				if (result == null) result = caseStyledElement(featureLabelProviderConfiguration);

+				if (result == null) result = caseEModelElement(featureLabelProviderConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = caseEModelElement(featureLabelProviderConfiguration);

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: {

+				ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)theEObject;

+				T result = caseObjectLabelProviderConfiguration(objectLabelProviderConfiguration);

+				if (result == null) result = caseILabelProviderConfiguration(objectLabelProviderConfiguration);

+				if (result == null) result = caseStyledElement(objectLabelProviderConfiguration);

+				if (result == null) result = caseEModelElement(objectLabelProviderConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = defaultCase(theEObject);

+			case NattablelabelproviderPackage.OPERATION_LABEL_PROVIDER_CONFIGURATION: {

+				OperationLabelProviderConfiguration operationLabelProviderConfiguration = (OperationLabelProviderConfiguration)theEObject;

+				T result = caseOperationLabelProviderConfiguration(operationLabelProviderConfiguration);

+				if (result == null) result = caseObjectLabelProviderConfiguration(operationLabelProviderConfiguration);

+				if (result == null) result = caseILabelProviderConfiguration(operationLabelProviderConfiguration);

+				if (result == null) result = caseStyledElement(operationLabelProviderConfiguration);

+				if (result == null) result = caseEModelElement(operationLabelProviderConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			return result;

-		}

-		case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION:

-		{

-			ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)theEObject;

-			T result = caseObjectLabelProviderConfiguration(objectLabelProviderConfiguration);

-			if(result == null) {

-				result = caseILabelProviderConfiguration(objectLabelProviderConfiguration);

-			}

-			if(result == null) {

-				result = caseStyledElement(objectLabelProviderConfiguration);

-			}

-			if(result == null) {

-				result = caseEModelElement(objectLabelProviderConfiguration);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -149,9 +127,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>ILabel Provider Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -166,9 +142,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -183,9 +157,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -195,14 +167,27 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 	}

 

 	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Operation 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>Operation Label Provider Configuration</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseOperationLabelProviderConfiguration(OperationLabelProviderConfiguration object) {

+		return null;

+	}

+

+	/**

 	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.

 	 * <!-- begin-user-doc -->

 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -217,9 +202,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -234,9 +217,7 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java
index 43156080998..297f6aac0b3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage

  * @generated

  */

@@ -29,7 +28,6 @@ public interface NattableproblemFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattableproblemFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemFactoryImpl.init();

@@ -38,7 +36,6 @@ public interface NattableproblemFactory extends EFactory {
 	 * Returns a new object of class '<em>Problem</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Problem</em>'.

 	 * @generated

 	 */

@@ -48,7 +45,6 @@ public interface NattableproblemFactory extends EFactory {
 	 * Returns a new object of class '<em>String Resolution Problem</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>String Resolution Problem</em>'.

 	 * @generated

 	 */

@@ -58,7 +54,6 @@ public interface NattableproblemFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java
index 0cc9e3efef3..6f09b96cec2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/NattableproblemPackage.java
@@ -29,7 +29,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.N
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemFactory

  * @model kind="package"

  * @generated

@@ -40,7 +39,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNAME = "nattableproblem"; //$NON-NLS-1$

@@ -49,7 +47,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableproblem"; //$NON-NLS-1$

@@ -58,7 +55,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "nattableproblem"; //$NON-NLS-1$

@@ -67,7 +63,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattableproblemPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl.init();

@@ -76,7 +71,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl <em>Problem</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getProblem()

 	 * @generated

@@ -87,7 +81,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -97,7 +90,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -107,7 +99,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -117,7 +108,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -127,7 +117,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The number of structural features of the '<em>Problem</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -137,7 +126,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -147,7 +135,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -157,7 +144,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -167,7 +153,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -177,18 +162,15 @@ public interface NattableproblemPackage extends EPackage {
 	 * The number of operations of the '<em>Problem</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int PROBLEM_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl

-	 * <em>String Resolution Problem</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl <em>String Resolution Problem</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getStringResolutionProblem()

 	 * @generated

@@ -199,7 +181,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -209,7 +190,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -219,7 +199,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -229,7 +208,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -239,7 +217,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The feature id for the '<em><b>Value As String</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -249,7 +226,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The feature id for the '<em><b>Unresolved String</b></em>' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -259,7 +235,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The number of structural features of the '<em>String Resolution Problem</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -269,7 +244,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -279,7 +253,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -289,7 +262,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -299,7 +271,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -309,7 +280,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * The number of operations of the '<em>String Resolution Problem</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -319,7 +289,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem <em>Problem</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Problem</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem

 	 * @generated

@@ -327,11 +296,9 @@ public interface NattableproblemPackage extends EPackage {
 	EClass getProblem();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem

-	 * <em>String Resolution Problem</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem <em>String Resolution Problem</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>String Resolution Problem</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem

 	 * @generated

@@ -339,11 +306,9 @@ public interface NattableproblemPackage extends EPackage {
 	EClass getStringResolutionProblem();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Value As String</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString()

 	 * @see #getStringResolutionProblem()

@@ -352,12 +317,9 @@ public interface NattableproblemPackage extends EPackage {
 	EAttribute getStringResolutionProblem_ValueAsString();

 

 	/**

-	 * Returns the meta object for the attribute list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString

-	 * <em>Unresolved String</em>}'.

+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString <em>Unresolved String</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute list '<em>Unresolved String</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString()

 	 * @see #getStringResolutionProblem()

@@ -369,7 +331,6 @@ public interface NattableproblemPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -386,17 +347,14 @@ public interface NattableproblemPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	interface Literals {

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl

-		 * <em>Problem</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl <em>Problem</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.ProblemImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getProblem()

 		 * @generated

@@ -404,11 +362,9 @@ public interface NattableproblemPackage extends EPackage {
 		EClass PROBLEM = eINSTANCE.getProblem();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl

-		 * <em>String Resolution Problem</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl <em>String Resolution Problem</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.NattableproblemPackageImpl#getStringResolutionProblem()

 		 * @generated

@@ -419,7 +375,6 @@ public interface NattableproblemPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Value As String</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING = eINSTANCE.getStringResolutionProblem_ValueAsString();

@@ -428,7 +383,6 @@ public interface NattableproblemPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Unresolved String</b></em>' attribute list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING = eINSTANCE.getStringResolutionProblem_UnresolvedString();

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java
index 3da22140ecf..99215607bdb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/StringResolutionProblem.java
@@ -25,12 +25,11 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString <em>Unresolved String

- * </em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getUnresolvedString <em>Unresolved String</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getStringResolutionProblem()

  * @model

@@ -45,7 +44,6 @@ public interface StringResolutionProblem extends Problem {
 	 * <!-- begin-model-doc -->

 	 * The text which is the source of the problem

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Value As String</em>' attribute.

 	 * @see #setValueAsString(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getStringResolutionProblem_ValueAsString()

@@ -55,13 +53,10 @@ public interface StringResolutionProblem extends Problem {
 	String getValueAsString();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString

-	 * <em>Value As String</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem#getValueAsString <em>Value As String</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Value As String</em>' attribute.

+	 * @param value the new value of the '<em>Value As String</em>' attribute.

 	 * @see #getValueAsString()

 	 * @generated

 	 */

@@ -75,7 +70,6 @@ public interface StringResolutionProblem extends Problem {
 	 * <!-- begin-model-doc -->

 	 * the text or a substring of it, which is the source of the problem

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Unresolved String</em>' attribute list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#getStringResolutionProblem_UnresolvedString()

 	 * @model required="true"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java
index 6bcf4e7c20e..da0ab358907 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemFactoryImpl.java
@@ -26,7 +26,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringR
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattableproblemFactoryImpl extends EFactoryImpl implements NattableproblemFactory {

@@ -35,16 +34,16 @@ public class NattableproblemFactoryImpl extends EFactoryImpl implements Nattable
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static NattableproblemFactory init() {

 		try {

 			NattableproblemFactory theNattableproblemFactory = (NattableproblemFactory)EPackage.Registry.INSTANCE.getEFactory(NattableproblemPackage.eNS_URI);

-			if(theNattableproblemFactory != null) {

+			if (theNattableproblemFactory != null) {

 				return theNattableproblemFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new NattableproblemFactoryImpl();

@@ -54,7 +53,6 @@ public class NattableproblemFactoryImpl extends EFactoryImpl implements Nattable
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableproblemFactoryImpl() {

@@ -64,25 +62,21 @@ public class NattableproblemFactoryImpl extends EFactoryImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

-		case NattableproblemPackage.PROBLEM:

-			return createProblem();

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM:

-			return createStringResolutionProblem();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eClass.getClassifierID()) {

+			case NattableproblemPackage.PROBLEM: return createProblem();

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM: return createStringResolutionProblem();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -94,7 +88,6 @@ public class NattableproblemFactoryImpl extends EFactoryImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -106,7 +99,6 @@ public class NattableproblemFactoryImpl extends EFactoryImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -117,7 +109,6 @@ public class NattableproblemFactoryImpl extends EFactoryImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java
index f875bb19b01..3a70e8ed806 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/NattableproblemPackageImpl.java
@@ -44,7 +44,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattableproblemPackageImpl extends EPackageImpl implements NattableproblemPackage {

@@ -52,7 +51,6 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass problemEClass = null;

@@ -60,19 +58,19 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass stringResolutionProblemEClass = null;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

 	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage#eNS_URI

 	 * @see #init()

@@ -85,32 +83,32 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link NattableproblemPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * 

+	 * <p>This method is used to initialize {@link NattableproblemPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static NattableproblemPackage init() {

-		if(isInited) {

-			return (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);

-		}

+		if (isInited) return (NattableproblemPackage)EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI);

+

 		// Obtain or create and register package

 		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableproblemPackageImpl());

+

 		isInited = true;

+

 		// Initialize simple dependencies

 		EcorePackage.eINSTANCE.eClass();

+

 		// Obtain or create and register interdependencies

 		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

 		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

@@ -121,6 +119,7 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);

 		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

 		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

+

 		// Create package meta-data objects

 		theNattableproblemPackage.createPackageContents();

 		theNattablePackage.createPackageContents();

@@ -132,6 +131,7 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 		theNattableaxisPackage.createPackageContents();

 		theNattablecellPackage.createPackageContents();

 		theNattablestylePackage.createPackageContents();

+

 		// Initialize created meta-data

 		theNattableproblemPackage.initializePackageContents();

 		theNattablePackage.initializePackageContents();

@@ -143,8 +143,11 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 		theNattableaxisPackage.initializePackageContents();

 		theNattablecellPackage.initializePackageContents();

 		theNattablestylePackage.initializePackageContents();

+

 		// Mark meta-data to indicate it can't be changed

 		theNattableproblemPackage.freeze();

+

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(NattableproblemPackage.eNS_URI, theNattableproblemPackage);

 		return theNattableproblemPackage;

@@ -153,7 +156,6 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -164,7 +166,6 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -175,7 +176,6 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -186,7 +186,6 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -197,7 +196,6 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -208,26 +206,24 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package. This method is

+	 * Creates the meta-model objects for the package.  This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated) {

-			return;

-		}

+		if (isCreated) return;

 		isCreated = true;

+

 		// Create classes and their features

 		problemEClass = createEClass(PROBLEM);

+

 		stringResolutionProblemEClass = createEClass(STRING_RESOLUTION_PROBLEM);

 		createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING);

 		createEAttribute(stringResolutionProblemEClass, STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);

@@ -236,37 +232,40 @@ public class NattableproblemPackageImpl extends EPackageImpl implements Nattable
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model. This

+	 * Complete the initialization of the package and its meta-model.  This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized) {

-			return;

-		}

+		if (isInitialized) return;

 		isInitialized = true;

+

 		// Initialize package

 		setName(eNAME);

 		setNsPrefix(eNS_PREFIX);

 		setNsURI(eNS_URI);

+

 		// Obtain other dependent packages

 		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);

+

 		// Create type parameters

+

 		// Set bounds for type parameters

+

 		// Add supertypes to classes

 		problemEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());

 		stringResolutionProblemEClass.getESuperTypes().add(this.getProblem());

+

 		// Initialize classes, features, and operations; add parameters

 		initEClass(problemEClass, Problem.class, "Problem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(stringResolutionProblemEClass, StringResolutionProblem.class, "StringResolutionProblem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getStringResolutionProblem_ValueAsString(), ecorePackage.getEString(), "valueAsString", null, 1, 1, StringResolutionProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEAttribute(getStringResolutionProblem_UnresolvedString(), ecorePackage.getEString(), "unresolvedString", null, 1, -1, StringResolutionProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java
index 734e4d0f3df..b797082ef05 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/ProblemImpl.java
@@ -21,8 +21,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem
  * <!-- begin-user-doc -->

  * An implementation of the model object '<em><b>Problem</b></em>'.

  * <!-- end-user-doc -->

- * <p>

- * </p>

  *

  * @generated

  */

@@ -31,7 +29,6 @@ public class ProblemImpl extends TableNamedElementImpl implements Problem {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected ProblemImpl() {

@@ -41,7 +38,6 @@ public class ProblemImpl extends TableNamedElementImpl implements Problem {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java
index 1e48a92364a..5d65b7406e5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/impl/StringResolutionProblemImpl.java
@@ -28,13 +28,11 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringR
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getValueAsString <em>Value As String

- * </em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getUnresolvedString <em>Unresolved

- * String</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getValueAsString <em>Value As String</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.impl.StringResolutionProblemImpl#getUnresolvedString <em>Unresolved String</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -44,7 +42,6 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	 * The default value of the '{@link #getValueAsString() <em>Value As String</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getValueAsString()

 	 * @generated

 	 * @ordered

@@ -55,7 +52,6 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	 * The cached value of the '{@link #getValueAsString() <em>Value As String</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getValueAsString()

 	 * @generated

 	 * @ordered

@@ -66,7 +62,6 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	 * The cached value of the '{@link #getUnresolvedString() <em>Unresolved String</em>}' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getUnresolvedString()

 	 * @generated

 	 * @ordered

@@ -76,7 +71,6 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected StringResolutionProblemImpl() {

@@ -86,7 +80,6 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -97,7 +90,6 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -108,27 +100,24 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setValueAsString(String newValueAsString) {

 		String oldValueAsString = valueAsString;

 		valueAsString = newValueAsString;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING, oldValueAsString, valueAsString));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<String> getUnresolvedString() {

-		if(unresolvedString == null) {

+		if (unresolvedString == null) {

 			unresolvedString = new EDataTypeUniqueEList<String>(String.class, this, NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING);

 		}

 		return unresolvedString;

@@ -137,16 +126,15 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

-			return getValueAsString();

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

-			return getUnresolvedString();

+		switch (featureID) {

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

+				return getValueAsString();

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

+				return getUnresolvedString();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -154,20 +142,19 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

-			setValueAsString((String)newValue);

-			return;

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

-			getUnresolvedString().clear();

-			getUnresolvedString().addAll((Collection<? extends String>)newValue);

-			return;

+		switch (featureID) {

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

+				setValueAsString((String)newValue);

+				return;

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

+				getUnresolvedString().clear();

+				getUnresolvedString().addAll((Collection<? extends String>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -175,18 +162,17 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

-			setValueAsString(VALUE_AS_STRING_EDEFAULT);

-			return;

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

-			getUnresolvedString().clear();

-			return;

+		switch (featureID) {

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

+				setValueAsString(VALUE_AS_STRING_EDEFAULT);

+				return;

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

+				getUnresolvedString().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -194,16 +180,15 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

-			return VALUE_AS_STRING_EDEFAULT == null ? valueAsString != null : !VALUE_AS_STRING_EDEFAULT.equals(valueAsString);

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

-			return unresolvedString != null && !unresolvedString.isEmpty();

+		switch (featureID) {

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__VALUE_AS_STRING:

+				return VALUE_AS_STRING_EDEFAULT == null ? valueAsString != null : !VALUE_AS_STRING_EDEFAULT.equals(valueAsString);

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM__UNRESOLVED_STRING:

+				return unresolvedString != null && !unresolvedString.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -211,14 +196,12 @@ public class StringResolutionProblemImpl extends ProblemImpl implements StringRe
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (valueAsString: "); //$NON-NLS-1$

 		result.append(valueAsString);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java
index 7b8d164eefa..2283d95892f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemAdapterFactory.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage

  * @generated

  */

@@ -38,7 +37,6 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattableproblemPackage modelPackage;

@@ -47,11 +45,10 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableproblemAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattableproblemPackage.eINSTANCE;

 		}

 	}

@@ -61,16 +58,15 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

+		if (object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

@@ -80,49 +76,40 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NattableproblemSwitch<Adapter> modelSwitch = new NattableproblemSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseProblem(Problem object) {

-			return createProblemAdapter();

-		}

-

-		@Override

-		public Adapter caseStringResolutionProblem(StringResolutionProblem object) {

-			return createStringResolutionProblemAdapter();

-		}

-

-		@Override

-		public Adapter caseEModelElement(EModelElement object) {

-			return createEModelElementAdapter();

-		}

-

-		@Override

-		public Adapter caseStyledElement(StyledElement object) {

-			return createStyledElementAdapter();

-		}

-

-		@Override

-		public Adapter caseTableNamedElement(TableNamedElement object) {

-			return createTableNamedElementAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

+			@Override

+			public Adapter caseProblem(Problem object) {

+				return createProblemAdapter();

+			}

+			@Override

+			public Adapter caseStringResolutionProblem(StringResolutionProblem object) {

+				return createStringResolutionProblemAdapter();

+			}

+			@Override

+			public Adapter caseEModelElement(EModelElement object) {

+				return createEModelElementAdapter();

+			}

+			@Override

+			public Adapter caseStyledElement(StyledElement object) {

+				return createStyledElementAdapter();

+			}

+			@Override

+			public Adapter caseTableNamedElement(TableNamedElement object) {

+				return createTableNamedElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *        the object to adapt.

+	 * @param target the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -132,13 +119,11 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem

-	 * <em>Problem</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.Problem <em>Problem</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.nattableproblem.Problem

 	 * @generated

@@ -148,13 +133,11 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem

-	 * <em>String Resolution Problem</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.StringResolutionProblem <em>String Resolution Problem</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.nattableproblem.StringResolutionProblem

 	 * @generated

@@ -169,7 +152,6 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.ecore.EModelElement

 	 * @generated

@@ -179,13 +161,11 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * <em>Styled Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

 	 * @generated

@@ -195,13 +175,11 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

-	 * <em>Table Named Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

 	 * @generated

@@ -215,7 +193,6 @@ public class NattableproblemAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java
index 04ba7bd6572..26813193fb2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableproblem/util/NattableproblemSwitch.java
@@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableproblem.NattableproblemPackage

  * @generated

  */

@@ -41,7 +40,6 @@ public class NattableproblemSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattableproblemPackage modelPackage;

@@ -50,11 +48,10 @@ public class NattableproblemSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableproblemSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattableproblemPackage.eINSTANCE;

 		}

 	}

@@ -63,8 +60,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

+	 * @param ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

 	 */

@@ -77,54 +73,32 @@ public class NattableproblemSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case NattableproblemPackage.PROBLEM:

-		{

-			Problem problem = (Problem)theEObject;

-			T result = caseProblem(problem);

-			if(result == null) {

-				result = caseTableNamedElement(problem);

-			}

-			if(result == null) {

-				result = caseStyledElement(problem);

-			}

-			if(result == null) {

-				result = caseEModelElement(problem);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattableproblemPackage.STRING_RESOLUTION_PROBLEM:

-		{

-			StringResolutionProblem stringResolutionProblem = (StringResolutionProblem)theEObject;

-			T result = caseStringResolutionProblem(stringResolutionProblem);

-			if(result == null) {

-				result = caseProblem(stringResolutionProblem);

-			}

-			if(result == null) {

-				result = caseTableNamedElement(stringResolutionProblem);

-			}

-			if(result == null) {

-				result = caseStyledElement(stringResolutionProblem);

+		switch (classifierID) {

+			case NattableproblemPackage.PROBLEM: {

+				Problem problem = (Problem)theEObject;

+				T result = caseProblem(problem);

+				if (result == null) result = caseTableNamedElement(problem);

+				if (result == null) result = caseStyledElement(problem);

+				if (result == null) result = caseEModelElement(problem);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = caseEModelElement(stringResolutionProblem);

+			case NattableproblemPackage.STRING_RESOLUTION_PROBLEM: {

+				StringResolutionProblem stringResolutionProblem = (StringResolutionProblem)theEObject;

+				T result = caseStringResolutionProblem(stringResolutionProblem);

+				if (result == null) result = caseProblem(stringResolutionProblem);

+				if (result == null) result = caseTableNamedElement(stringResolutionProblem);

+				if (result == null) result = caseStyledElement(stringResolutionProblem);

+				if (result == null) result = caseEModelElement(stringResolutionProblem);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -134,9 +108,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Problem</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -151,9 +123,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>String Resolution Problem</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -168,9 +138,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -185,9 +153,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -202,9 +168,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -219,9 +183,7 @@ public class NattableproblemSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java
index a70405bc349..1b64efe5a22 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanListValueStyle.java
@@ -25,10 +25,10 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanListValueStyle()

  * @model

@@ -44,7 +44,6 @@ public interface BooleanListValueStyle extends NamedStyle {
 	 * If the meaning of the '<em>Boolean List Value</em>' attribute list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Boolean List Value</em>' attribute list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanListValueStyle_BooleanListValue()

 	 * @model unique="false"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java
index a04e05bb75b..6da6fccda7c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/BooleanValueStyle.java
@@ -23,10 +23,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanValueStyle()

  * @model

@@ -41,7 +41,6 @@ public interface BooleanValueStyle extends NamedStyle {
 	 * If the meaning of the '<em>Boolean Value</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Boolean Value</em>' attribute.

 	 * @see #setBooleanValue(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getBooleanValueStyle_BooleanValue()

@@ -51,13 +50,10 @@ public interface BooleanValueStyle extends NamedStyle {
 	boolean isBooleanValue();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue

-	 * <em>Boolean Value</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Boolean Value</em>' attribute.

+	 * @param value the new value of the '<em>Boolean Value</em>' attribute.

 	 * @see #isBooleanValue()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java
index 578dee36d56..0f07070ed81 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextAlignment.java
@@ -26,7 +26,6 @@ import org.eclipse.emf.common.util.Enumerator;
  * <!-- begin-model-doc -->

  * Alignment of the text inside its cell

  * <!-- end-model-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextAlignment()

  * @model

  * @generated

@@ -36,7 +35,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * The '<em><b>TOP LEFT</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #TOP_LEFT_VALUE

 	 * @generated

 	 * @ordered

@@ -46,7 +44,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * The '<em><b>TOP CENTER</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #TOP_CENTER_VALUE

 	 * @generated

 	 * @ordered

@@ -56,7 +53,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * The '<em><b>TOP RIGHT</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #TOP_RIGHT_VALUE

 	 * @generated

 	 * @ordered

@@ -66,7 +62,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * The '<em><b>MIDDLE LEFT</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #MIDDLE_LEFT_VALUE

 	 * @generated

 	 * @ordered

@@ -76,7 +71,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * The '<em><b>MIDDLE CENTER</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #MIDDLE_CENTER_VALUE

 	 * @generated

 	 * @ordered

@@ -86,7 +80,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * The '<em><b>MIDDLE RIGHT</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #MIDDLE_RIGHT_VALUE

 	 * @generated

 	 * @ordered

@@ -96,7 +89,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * The '<em><b>BOTTOM LEFT</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #BOTTOM_LEFT_VALUE

 	 * @generated

 	 * @ordered

@@ -106,7 +98,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * The '<em><b>BOTTOM CENTER</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #BOTTOM_CENTER_VALUE

 	 * @generated

 	 * @ordered

@@ -116,7 +107,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * The '<em><b>BOTTOM RIGHT</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #BOTTOM_RIGHT_VALUE

 	 * @generated

 	 * @ordered

@@ -130,7 +120,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * If the meaning of '<em><b>TOP LEFT</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #TOP_LEFT

 	 * @model

 	 * @generated

@@ -145,7 +134,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * If the meaning of '<em><b>TOP CENTER</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #TOP_CENTER

 	 * @model

 	 * @generated

@@ -160,7 +148,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * If the meaning of '<em><b>TOP RIGHT</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #TOP_RIGHT

 	 * @model

 	 * @generated

@@ -175,7 +162,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * If the meaning of '<em><b>MIDDLE LEFT</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #MIDDLE_LEFT

 	 * @model

 	 * @generated

@@ -190,7 +176,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * If the meaning of '<em><b>MIDDLE CENTER</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #MIDDLE_CENTER

 	 * @model

 	 * @generated

@@ -205,7 +190,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * If the meaning of '<em><b>MIDDLE RIGHT</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #MIDDLE_RIGHT

 	 * @model

 	 * @generated

@@ -220,7 +204,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * If the meaning of '<em><b>BOTTOM LEFT</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #BOTTOM_LEFT

 	 * @model

 	 * @generated

@@ -235,7 +218,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * If the meaning of '<em><b>BOTTOM CENTER</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #BOTTOM_CENTER

 	 * @model

 	 * @generated

@@ -250,7 +232,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * If the meaning of '<em><b>BOTTOM RIGHT</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #BOTTOM_RIGHT

 	 * @model

 	 * @generated

@@ -262,16 +243,24 @@ public enum CellTextAlignment implements Enumerator {
 	 * An array of all the '<em><b>Cell Text Alignment</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	private static final CellTextAlignment[] VALUES_ARRAY = new CellTextAlignment[]{ TOP_LEFT, TOP_CENTER, TOP_RIGHT, MIDDLE_LEFT, MIDDLE_CENTER, MIDDLE_RIGHT, BOTTOM_LEFT, BOTTOM_CENTER, BOTTOM_RIGHT, };

+	private static final CellTextAlignment[] VALUES_ARRAY = new CellTextAlignment[] {

+			TOP_LEFT,

+			TOP_CENTER,

+			TOP_RIGHT,

+			MIDDLE_LEFT,

+			MIDDLE_CENTER,

+			MIDDLE_RIGHT,

+			BOTTOM_LEFT,

+			BOTTOM_CENTER,

+			BOTTOM_RIGHT,

+		};

 

 	/**

 	 * A public read-only list of all the '<em><b>Cell Text Alignment</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static final List<CellTextAlignment> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -280,13 +269,14 @@ public enum CellTextAlignment implements Enumerator {
 	 * Returns the '<em><b>Cell Text Alignment</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param literal the literal.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static CellTextAlignment get(String literal) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			CellTextAlignment result = VALUES_ARRAY[i];

-			if(result.toString().equals(literal)) {

+			if (result.toString().equals(literal)) {

 				return result;

 			}

 		}

@@ -297,13 +287,14 @@ public enum CellTextAlignment implements Enumerator {
 	 * Returns the '<em><b>Cell Text Alignment</b></em>' literal with the specified name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param name the name.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static CellTextAlignment getByName(String name) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			CellTextAlignment result = VALUES_ARRAY[i];

-			if(result.getName().equals(name)) {

+			if (result.getName().equals(name)) {

 				return result;

 			}

 		}

@@ -314,29 +305,21 @@ public enum CellTextAlignment implements Enumerator {
 	 * Returns the '<em><b>Cell Text Alignment</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param value the integer value.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static CellTextAlignment get(int value) {

-		switch(value) {

-		case TOP_LEFT_VALUE:

-			return TOP_LEFT;

-		case TOP_CENTER_VALUE:

-			return TOP_CENTER;

-		case TOP_RIGHT_VALUE:

-			return TOP_RIGHT;

-		case MIDDLE_LEFT_VALUE:

-			return MIDDLE_LEFT;

-		case MIDDLE_CENTER_VALUE:

-			return MIDDLE_CENTER;

-		case MIDDLE_RIGHT_VALUE:

-			return MIDDLE_RIGHT;

-		case BOTTOM_LEFT_VALUE:

-			return BOTTOM_LEFT;

-		case BOTTOM_CENTER_VALUE:

-			return BOTTOM_CENTER;

-		case BOTTOM_RIGHT_VALUE:

-			return BOTTOM_RIGHT;

+		switch (value) {

+			case TOP_LEFT_VALUE: return TOP_LEFT;

+			case TOP_CENTER_VALUE: return TOP_CENTER;

+			case TOP_RIGHT_VALUE: return TOP_RIGHT;

+			case MIDDLE_LEFT_VALUE: return MIDDLE_LEFT;

+			case MIDDLE_CENTER_VALUE: return MIDDLE_CENTER;

+			case MIDDLE_RIGHT_VALUE: return MIDDLE_RIGHT;

+			case BOTTOM_LEFT_VALUE: return BOTTOM_LEFT;

+			case BOTTOM_CENTER_VALUE: return BOTTOM_CENTER;

+			case BOTTOM_RIGHT_VALUE: return BOTTOM_RIGHT;

 		}

 		return null;

 	}

@@ -344,7 +327,6 @@ public enum CellTextAlignment implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final int value;

@@ -352,7 +334,6 @@ public enum CellTextAlignment implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final String name;

@@ -360,7 +341,6 @@ public enum CellTextAlignment implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final String literal;

@@ -369,7 +349,6 @@ public enum CellTextAlignment implements Enumerator {
 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private CellTextAlignment(int value, String name, String literal) {

@@ -381,41 +360,37 @@ public enum CellTextAlignment implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int getValue() {

-		return value;

+	  return value;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getName() {

-		return name;

+	  return name;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getLiteral() {

-		return literal;

+	  return literal;

 	}

 

 	/**

 	 * Returns the literal value of the enumerator, which is its string representation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java
index f35343245c4..0693f1a7dfe 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/CellTextStyle.java
@@ -23,10 +23,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getCellTextStyle()

  * @model

@@ -43,7 +43,6 @@ public interface CellTextStyle extends Style {
 	 * If the meaning of the '<em>Alignment</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Alignment</em>' attribute.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

 	 * @see #setAlignment(CellTextAlignment)

@@ -54,13 +53,10 @@ public interface CellTextStyle extends Style {
 	CellTextAlignment getAlignment();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Alignment</em>' attribute.

+	 * @param value the new value of the '<em>Alignment</em>' attribute.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

 	 * @see #getAlignment()

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java
index 1ef0a3f7006..f42917c92ad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DisplayStyle.java
@@ -23,7 +23,6 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Display Style</b></em>',

  * and utility methods for working with them.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDisplayStyle()

  * @model

  * @generated

@@ -33,7 +32,6 @@ public enum DisplayStyle implements Enumerator {
 	 * The '<em><b>NORMAL</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #NORMAL_VALUE

 	 * @generated

 	 * @ordered

@@ -43,7 +41,6 @@ public enum DisplayStyle implements Enumerator {
 	 * The '<em><b>HIERARCHIC SINGLE TREE COLUMN</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #HIERARCHIC_SINGLE_TREE_COLUMN_VALUE

 	 * @generated

 	 * @ordered

@@ -53,7 +50,6 @@ public enum DisplayStyle implements Enumerator {
 	 * The '<em><b>HIERARCHIC MULTI TREE COLUMN</b></em>' literal object.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #HIERARCHIC_MULTI_TREE_COLUMN_VALUE

 	 * @generated

 	 * @ordered

@@ -67,7 +63,6 @@ public enum DisplayStyle implements Enumerator {
 	 * If the meaning of '<em><b>NORMAL</b></em>' literal object isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #NORMAL

 	 * @model

 	 * @generated

@@ -83,7 +78,6 @@ public enum DisplayStyle implements Enumerator {
 	 * here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #HIERARCHIC_SINGLE_TREE_COLUMN

 	 * @model

 	 * @generated

@@ -99,7 +93,6 @@ public enum DisplayStyle implements Enumerator {
 	 * here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #HIERARCHIC_MULTI_TREE_COLUMN

 	 * @model

 	 * @generated

@@ -111,16 +104,18 @@ public enum DisplayStyle implements Enumerator {
 	 * An array of all the '<em><b>Display Style</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

-	private static final DisplayStyle[] VALUES_ARRAY = new DisplayStyle[]{ NORMAL, HIERARCHIC_SINGLE_TREE_COLUMN, HIERARCHIC_MULTI_TREE_COLUMN, };

+	private static final DisplayStyle[] VALUES_ARRAY = new DisplayStyle[] {

+			NORMAL,

+			HIERARCHIC_SINGLE_TREE_COLUMN,

+			HIERARCHIC_MULTI_TREE_COLUMN,

+		};

 

 	/**

 	 * A public read-only list of all the '<em><b>Display Style</b></em>' enumerators.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static final List<DisplayStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

@@ -129,13 +124,14 @@ public enum DisplayStyle implements Enumerator {
 	 * Returns the '<em><b>Display Style</b></em>' literal with the specified literal value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param literal the literal.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static DisplayStyle get(String literal) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			DisplayStyle result = VALUES_ARRAY[i];

-			if(result.toString().equals(literal)) {

+			if (result.toString().equals(literal)) {

 				return result;

 			}

 		}

@@ -146,13 +142,14 @@ public enum DisplayStyle implements Enumerator {
 	 * Returns the '<em><b>Display Style</b></em>' literal with the specified name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param name the name.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static DisplayStyle getByName(String name) {

-		for(int i = 0; i < VALUES_ARRAY.length; ++i) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

 			DisplayStyle result = VALUES_ARRAY[i];

-			if(result.getName().equals(name)) {

+			if (result.getName().equals(name)) {

 				return result;

 			}

 		}

@@ -163,17 +160,15 @@ public enum DisplayStyle implements Enumerator {
 	 * Returns the '<em><b>Display Style</b></em>' literal with the specified integer value.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

+	 * @param value the integer value.

+	 * @return the matching enumerator or <code>null</code>.

 	 * @generated

 	 */

 	public static DisplayStyle get(int value) {

-		switch(value) {

-		case NORMAL_VALUE:

-			return NORMAL;

-		case HIERARCHIC_SINGLE_TREE_COLUMN_VALUE:

-			return HIERARCHIC_SINGLE_TREE_COLUMN;

-		case HIERARCHIC_MULTI_TREE_COLUMN_VALUE:

-			return HIERARCHIC_MULTI_TREE_COLUMN;

+		switch (value) {

+			case NORMAL_VALUE: return NORMAL;

+			case HIERARCHIC_SINGLE_TREE_COLUMN_VALUE: return HIERARCHIC_SINGLE_TREE_COLUMN;

+			case HIERARCHIC_MULTI_TREE_COLUMN_VALUE: return HIERARCHIC_MULTI_TREE_COLUMN;

 		}

 		return null;

 	}

@@ -181,7 +176,6 @@ public enum DisplayStyle implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final int value;

@@ -189,7 +183,6 @@ public enum DisplayStyle implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final String name;

@@ -197,7 +190,6 @@ public enum DisplayStyle implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private final String literal;

@@ -206,7 +198,6 @@ public enum DisplayStyle implements Enumerator {
 	 * Only this class can construct instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private DisplayStyle(int value, String name, String literal) {

@@ -218,41 +209,37 @@ public enum DisplayStyle implements Enumerator {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public int getValue() {

-		return value;

+	  return value;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getName() {

-		return name;

+	  return name;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String getLiteral() {

-		return literal;

+	  return literal;

 	}

 

 	/**

 	 * Returns the literal value of the enumerator, which is its string representation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java
index 60fcccabab9..5d3f7cfde56 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleListValueStyle.java
@@ -25,10 +25,10 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleListValueStyle()

  * @model

@@ -44,7 +44,6 @@ public interface DoubleListValueStyle extends NamedStyle {
 	 * If the meaning of the '<em>Double List Value</em>' attribute list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Double List Value</em>' attribute list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleListValueStyle_DoubleListValue()

 	 * @model unique="false"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java
index f11fa2a5fe7..eb876d3cd9e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/DoubleValueStyle.java
@@ -23,10 +23,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleValueStyle()

  * @model

@@ -41,7 +41,6 @@ public interface DoubleValueStyle extends NamedStyle {
 	 * If the meaning of the '<em>Double Value</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Double Value</em>' attribute.

 	 * @see #setDoubleValue(double)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getDoubleValueStyle_DoubleValue()

@@ -51,13 +50,10 @@ public interface DoubleValueStyle extends NamedStyle {
 	double getDoubleValue();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue

-	 * <em>Double Value</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Double Value</em>' attribute.

+	 * @param value the new value of the '<em>Double Value</em>' attribute.

 	 * @see #getDoubleValue()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectListValueStyle.java
index 2f36665e918..16ecddc03f9 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectListValueStyle.java
@@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue <em>EObject Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue <em>EObject Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getEObjectListValueStyle()
  * @model
@@ -41,7 +41,6 @@ public interface EObjectListValueStyle extends NamedStyle {
 	 * If the meaning of the '<em>EObject Value</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>EObject Value</em>' reference list.
 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getEObjectListValueStyle_EObjectValue()
 	 * @model
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectValueStyle.java
index 6f19cb724a1..b846fae361f 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/EObjectValueStyle.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getEObjectValueStyle()
  * @model
@@ -39,7 +39,6 @@ public interface EObjectValueStyle extends NamedStyle {
 	 * If the meaning of the '<em>EObject Value</em>' reference isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>EObject Value</em>' reference.
 	 * @see #setEObjectValue(EObject)
 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getEObjectValueStyle_EObjectValue()
@@ -49,13 +48,10 @@ public interface EObjectValueStyle extends NamedStyle {
 	EObject getEObjectValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue
-	 * <em>EObject Value</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *        the new value of the '<em>EObject Value</em>' reference.
+	 * @param value the new value of the '<em>EObject Value</em>' reference.
 	 * @see #getEObjectValue()
 	 * @generated
 	 */
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java
index 291f981f39f..03d72cd5e0d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/FontStyle.java
@@ -23,16 +23,16 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold <em>Bold</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic <em>Italic</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold <em>Bold</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic <em>Italic</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle()

  * @model

@@ -48,7 +48,6 @@ public interface FontStyle extends Style {
 	 * If the meaning of the '<em>Font Color</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Font Color</em>' attribute.

 	 * @see #setFontColor(int)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_FontColor()

@@ -58,13 +57,10 @@ public interface FontStyle extends Style {
 	int getFontColor();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Font Color</em>' attribute.

+	 * @param value the new value of the '<em>Font Color</em>' attribute.

 	 * @see #getFontColor()

 	 * @generated

 	 */

@@ -78,7 +74,6 @@ public interface FontStyle extends Style {
 	 * If the meaning of the '<em>Font 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>Font Name</em>' attribute.

 	 * @see #setFontName(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_FontName()

@@ -88,13 +83,10 @@ public interface FontStyle extends Style {
 	String getFontName();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Font Name</em>' attribute.

+	 * @param value the new value of the '<em>Font Name</em>' attribute.

 	 * @see #getFontName()

 	 * @generated

 	 */

@@ -108,7 +100,6 @@ public interface FontStyle extends Style {
 	 * If the meaning of the '<em>Font Height</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Font Height</em>' attribute.

 	 * @see #setFontHeight(int)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_FontHeight()

@@ -118,13 +109,10 @@ public interface FontStyle extends Style {
 	int getFontHeight();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Font Height</em>' attribute.

+	 * @param value the new value of the '<em>Font Height</em>' attribute.

 	 * @see #getFontHeight()

 	 * @generated

 	 */

@@ -138,7 +126,6 @@ public interface FontStyle extends Style {
 	 * If the meaning of the '<em>Bold</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Bold</em>' attribute.

 	 * @see #setBold(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_Bold()

@@ -151,9 +138,7 @@ public interface FontStyle extends Style {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold <em>Bold</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Bold</em>' attribute.

+	 * @param value the new value of the '<em>Bold</em>' attribute.

 	 * @see #isBold()

 	 * @generated

 	 */

@@ -167,7 +152,6 @@ public interface FontStyle extends Style {
 	 * If the meaning of the '<em>Italic</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Italic</em>' attribute.

 	 * @see #setItalic(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_Italic()

@@ -180,9 +164,7 @@ public interface FontStyle extends Style {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic <em>Italic</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Italic</em>' attribute.

+	 * @param value the new value of the '<em>Italic</em>' attribute.

 	 * @see #isItalic()

 	 * @generated

 	 */

@@ -196,7 +178,6 @@ public interface FontStyle extends Style {
 	 * If the meaning of the '<em>Underline</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Underline</em>' attribute.

 	 * @see #setUnderline(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_Underline()

@@ -206,13 +187,10 @@ public interface FontStyle extends Style {
 	boolean isUnderline();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Underline</em>' attribute.

+	 * @param value the new value of the '<em>Underline</em>' attribute.

 	 * @see #isUnderline()

 	 * @generated

 	 */

@@ -226,7 +204,6 @@ public interface FontStyle extends Style {
 	 * If the meaning of the '<em>Strike Through</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Strike Through</em>' attribute.

 	 * @see #setStrikeThrough(boolean)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getFontStyle_StrikeThrough()

@@ -236,13 +213,10 @@ public interface FontStyle extends Style {
 	boolean isStrikeThrough();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough

-	 * <em>Strike Through</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Strike Through</em>' attribute.

+	 * @param value the new value of the '<em>Strike Through</em>' attribute.

 	 * @see #isStrikeThrough()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java
index 7bf222fd538..ac176e848ad 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntListValueStyle.java
@@ -25,10 +25,10 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue <em>Int List Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue <em>Int List Value</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntListValueStyle()

  * @model

@@ -44,7 +44,6 @@ public interface IntListValueStyle extends NamedStyle {
 	 * If the meaning of the '<em>Int List Value</em>' attribute list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Int List Value</em>' attribute list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntListValueStyle_IntListValue()

 	 * @model unique="false"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java
index 98790886c86..de92fb7f634 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/IntValueStyle.java
@@ -23,10 +23,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntValueStyle()

  * @model

@@ -41,7 +41,6 @@ public interface IntValueStyle extends NamedStyle {
 	 * If the meaning of the '<em>Int Value</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Int Value</em>' attribute.

 	 * @see #setIntValue(int)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getIntValueStyle_IntValue()

@@ -51,13 +50,10 @@ public interface IntValueStyle extends NamedStyle {
 	int getIntValue();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Int Value</em>' attribute.

+	 * @param value the new value of the '<em>Int Value</em>' attribute.

 	 * @see #getIntValue()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java
index 88be211a75e..e2fc1fa0707 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NamedStyle.java
@@ -23,10 +23,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getNamedStyle()

  * @model

@@ -41,7 +41,6 @@ public interface NamedStyle extends Style {
 	 * 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.nattablestyle.NattablestylePackage#getNamedStyle_Name()

@@ -54,9 +53,7 @@ public interface NamedStyle extends Style {
 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Name</em>' attribute.

+	 * @param value the new value of the '<em>Name</em>' attribute.

 	 * @see #getName()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java
index c54c5f3ec33..0aa8ddcf2c7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestyleFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage

  * @generated

  */

@@ -29,7 +28,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattablestyleFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestyleFactoryImpl.init();

@@ -38,7 +36,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>Named Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Named Style</em>'.

 	 * @generated

 	 */

@@ -48,7 +45,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>Font Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Font Style</em>'.

 	 * @generated

 	 */

@@ -58,7 +54,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>Cell Text Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Cell Text Style</em>'.

 	 * @generated

 	 */

@@ -68,7 +63,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>Int Value Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Int Value Style</em>'.

 	 * @generated

 	 */

@@ -78,7 +72,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>Int List Value Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Int List Value Style</em>'.

 	 * @generated

 	 */

@@ -88,7 +81,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>Boolean Value Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Boolean Value Style</em>'.

 	 * @generated

 	 */

@@ -98,7 +90,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>Boolean List Value Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Boolean List Value Style</em>'.

 	 * @generated

 	 */

@@ -108,7 +99,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>Double Value Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Double Value Style</em>'.

 	 * @generated

 	 */

@@ -118,7 +108,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>Double List Value Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Double List Value Style</em>'.

 	 * @generated

 	 */

@@ -128,7 +117,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>String Value Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>String Value Style</em>'.

 	 * @generated

 	 */

@@ -138,7 +126,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>String List Value Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>String List Value Style</em>'.

 	 * @generated

 	 */

@@ -148,7 +135,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>Table Display Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Table Display Style</em>'.

 	 * @generated

 	 */

@@ -158,7 +144,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>EObject Value Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>EObject Value Style</em>'.

 	 * @generated

 	 */

@@ -168,7 +153,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns a new object of class '<em>EObject List Value Style</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>EObject List Value Style</em>'.

 	 * @generated

 	 */

@@ -178,7 +162,6 @@ public interface NattablestyleFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java
index 1d27af912db..eac0e52f011 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/NattablestylePackage.java
@@ -32,7 +32,6 @@ import org.eclipse.emf.ecore.EcorePackage;
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory

  * @model kind="package"

  * @generated

@@ -43,7 +42,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNAME = "nattablestyle"; //$NON-NLS-1$

@@ -52,7 +50,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle"; //$NON-NLS-1$

@@ -61,7 +58,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "nattablestyle"; //$NON-NLS-1$

@@ -70,7 +66,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattablestylePackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl.init();

@@ -79,7 +74,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyle()

 	 * @generated

@@ -90,7 +84,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -100,7 +93,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -110,7 +102,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -120,18 +111,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int STYLE_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl <em>Named Style</em>}'

-	 * class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl <em>Named Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getNamedStyle()

 	 * @generated

@@ -142,7 +130,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -152,7 +139,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -162,7 +148,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Named Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -172,7 +157,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -182,18 +166,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Named Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int NAMED_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl <em>Font Style</em>}'

-	 * class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl <em>Font Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getFontStyle()

 	 * @generated

@@ -204,7 +185,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -214,7 +194,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Font Color</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -224,7 +203,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Font Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -234,7 +212,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Font Height</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -244,7 +221,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Bold</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -254,7 +230,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Italic</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -264,7 +239,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Underline</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -274,7 +248,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Strike Through</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -284,7 +257,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Font Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -294,7 +266,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -304,18 +275,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Font Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int FONT_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl

-	 * <em>Cell Text Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl <em>Cell Text Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextStyle()

 	 * @generated

@@ -326,7 +294,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -336,7 +303,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Alignment</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -346,7 +312,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Cell Text Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -356,7 +321,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -366,18 +330,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Cell Text Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int CELL_TEXT_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl

-	 * <em>Int Value Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl <em>Int Value Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntValueStyle()

 	 * @generated

@@ -388,7 +349,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -398,7 +358,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -408,7 +367,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Int Value</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -418,7 +376,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Int Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -428,7 +385,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -438,18 +394,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Int Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int INT_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl

-	 * <em>Int List Value Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl <em>Int List Value Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntListValueStyle()

 	 * @generated

@@ -460,7 +413,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -470,7 +422,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -480,7 +431,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Int List Value</b></em>' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -490,7 +440,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Int List Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -500,7 +449,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -510,18 +458,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Int List Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int INT_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl

-	 * <em>Boolean Value Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl <em>Boolean Value Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanValueStyle()

 	 * @generated

@@ -532,7 +477,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -542,7 +486,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -552,7 +495,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Boolean Value</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -562,7 +504,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Boolean Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -572,7 +513,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -582,18 +522,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Boolean Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int BOOLEAN_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl

-	 * <em>Boolean List Value Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl <em>Boolean List Value Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanListValueStyle()

 	 * @generated

@@ -604,7 +541,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -614,7 +550,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -624,7 +559,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Boolean List Value</b></em>' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -634,7 +568,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Boolean List Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -644,7 +577,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -654,18 +586,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Boolean List Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int BOOLEAN_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl

-	 * <em>Double Value Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl <em>Double Value Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleValueStyle()

 	 * @generated

@@ -676,7 +605,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -686,7 +614,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -696,7 +623,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Double Value</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -706,7 +632,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Double Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -716,7 +641,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -726,18 +650,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Double Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int DOUBLE_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl

-	 * <em>Double List Value Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl <em>Double List Value Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleListValueStyle()

 	 * @generated

@@ -748,7 +669,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -758,7 +678,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -768,7 +687,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Double List Value</b></em>' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -778,7 +696,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Double List Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -788,7 +705,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -798,18 +714,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Double List Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int DOUBLE_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl

-	 * <em>String Value Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl <em>String Value Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringValueStyle()

 	 * @generated

@@ -820,7 +733,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -830,7 +742,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -840,7 +751,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>String Value</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -850,7 +760,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>String Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -860,7 +769,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -870,18 +778,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>String Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int STRING_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl

-	 * <em>String List Value Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl <em>String List Value Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringListValueStyle()

 	 * @generated

@@ -892,7 +797,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -902,7 +806,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -912,7 +815,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>String List Value</b></em>' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -922,7 +824,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>String List Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -932,7 +833,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -942,18 +842,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>String List Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int STRING_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl

-	 * <em>Styled Element</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl <em>Styled Element</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyledElement()

 	 * @generated

@@ -964,7 +861,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -974,7 +870,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -984,7 +879,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Styled Element</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -994,7 +888,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1004,7 +897,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1014,7 +906,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1024,7 +915,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1034,18 +924,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Styled Element</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int STYLED_ELEMENT_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 3;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl

-	 * <em>Table Display Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl <em>Table Display Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getTableDisplayStyle()

 	 * @generated

@@ -1056,7 +943,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1066,7 +952,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Display Style</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1076,7 +961,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>Table Display Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1086,7 +970,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1096,18 +979,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>Table Display Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int TABLE_DISPLAY_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl

-	 * <em>EObject Value Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl <em>EObject Value Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectValueStyle()

 	 * @generated

@@ -1118,7 +998,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1128,7 +1007,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1138,7 +1016,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EObject Value</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1148,7 +1025,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>EObject Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1158,7 +1034,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1168,18 +1043,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>EObject Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int EOBJECT_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl

-	 * <em>EObject List Value Style</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl <em>EObject List Value Style</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectListValueStyle()

 	 * @generated

@@ -1190,7 +1062,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1200,7 +1071,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1210,7 +1080,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The feature id for the '<em><b>EObject Value</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1220,7 +1089,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of structural features of the '<em>EObject List Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1230,7 +1098,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -1240,18 +1107,15 @@ public interface NattablestylePackage extends EPackage {
 	 * The number of operations of the '<em>EObject List Value Style</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int EOBJECT_LIST_VALUE_STYLE_OPERATION_COUNT = NAMED_STYLE_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

-	 * <em>Cell Text Alignment</em>}' enum.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}' enum.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextAlignment()

 	 * @generated

@@ -1262,7 +1126,6 @@ public interface NattablestylePackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle <em>Display Style</em>}' enum.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDisplayStyle()

 	 * @generated

@@ -1273,7 +1136,6 @@ public interface NattablestylePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style

 	 * @generated

@@ -1284,7 +1146,6 @@ public interface NattablestylePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle <em>Named Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Named Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle

 	 * @generated

@@ -1292,11 +1153,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getNamedStyle();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#getName

-	 * <em>Name</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle#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.nattablestyle.NamedStyle#getName()

 	 * @see #getNamedStyle()

@@ -1308,7 +1167,6 @@ public interface NattablestylePackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle <em>Font Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Font Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle

 	 * @generated

@@ -1316,11 +1174,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getFontStyle();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor

-	 * <em>Font Color</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor <em>Font Color</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Font Color</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontColor()

 	 * @see #getFontStyle()

@@ -1329,11 +1185,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getFontStyle_FontColor();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName

-	 * <em>Font Name</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName <em>Font Name</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Font Name</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontName()

 	 * @see #getFontStyle()

@@ -1342,11 +1196,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getFontStyle_FontName();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight

-	 * <em>Font Height</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight <em>Font Height</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Font Height</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#getFontHeight()

 	 * @see #getFontStyle()

@@ -1355,11 +1207,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getFontStyle_FontHeight();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold

-	 * <em>Bold</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold <em>Bold</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Bold</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isBold()

 	 * @see #getFontStyle()

@@ -1368,11 +1218,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getFontStyle_Bold();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic

-	 * <em>Italic</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic <em>Italic</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Italic</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isItalic()

 	 * @see #getFontStyle()

@@ -1381,11 +1229,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getFontStyle_Italic();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline

-	 * <em>Underline</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline <em>Underline</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Underline</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isUnderline()

 	 * @see #getFontStyle()

@@ -1394,11 +1240,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getFontStyle_Underline();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough

-	 * <em>Strike Through</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough <em>Strike Through</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Strike Through</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle#isStrikeThrough()

 	 * @see #getFontStyle()

@@ -1407,11 +1251,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getFontStyle_StrikeThrough();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle

-	 * <em>Cell Text Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle <em>Cell Text Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Cell Text Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle

 	 * @generated

@@ -1419,11 +1261,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getCellTextStyle();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment

-	 * <em>Alignment</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment <em>Alignment</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Alignment</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle#getAlignment()

 	 * @see #getCellTextStyle()

@@ -1432,11 +1272,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getCellTextStyle_Alignment();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle

-	 * <em>Int Value Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle <em>Int Value Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Int Value Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle

 	 * @generated

@@ -1444,11 +1282,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getIntValueStyle();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue

-	 * <em>Int Value</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue <em>Int Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Int Value</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle#getIntValue()

 	 * @see #getIntValueStyle()

@@ -1457,11 +1293,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getIntValueStyle_IntValue();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle

-	 * <em>Int List Value Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle <em>Int List Value Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Int List Value Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle

 	 * @generated

@@ -1469,11 +1303,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getIntListValueStyle();

 

 	/**

-	 * Returns the meta object for the attribute list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue <em>Int List Value</em>}'.

+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue <em>Int List Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute list '<em>Int List Value</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle#getIntListValue()

 	 * @see #getIntListValueStyle()

@@ -1482,11 +1314,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getIntListValueStyle_IntListValue();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle

-	 * <em>Boolean Value Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle <em>Boolean Value Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Boolean Value Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle

 	 * @generated

@@ -1494,11 +1324,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getBooleanValueStyle();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue <em>Boolean Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Boolean Value</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle#isBooleanValue()

 	 * @see #getBooleanValueStyle()

@@ -1507,11 +1335,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getBooleanValueStyle_BooleanValue();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle

-	 * <em>Boolean List Value Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle <em>Boolean List Value Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Boolean List Value Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle

 	 * @generated

@@ -1519,11 +1345,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getBooleanListValueStyle();

 

 	/**

-	 * Returns the meta object for the attribute list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}'.

+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue <em>Boolean List Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute list '<em>Boolean List Value</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle#getBooleanListValue()

 	 * @see #getBooleanListValueStyle()

@@ -1532,11 +1356,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getBooleanListValueStyle_BooleanListValue();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle

-	 * <em>Double Value Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle <em>Double Value Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Double Value Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle

 	 * @generated

@@ -1544,11 +1366,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getDoubleValueStyle();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue <em>Double Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Double Value</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle#getDoubleValue()

 	 * @see #getDoubleValueStyle()

@@ -1557,11 +1377,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getDoubleValueStyle_DoubleValue();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle

-	 * <em>Double List Value Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle <em>Double List Value Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Double List Value Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle

 	 * @generated

@@ -1569,11 +1387,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getDoubleListValueStyle();

 

 	/**

-	 * Returns the meta object for the attribute list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}'.

+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue <em>Double List Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute list '<em>Double List Value</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle#getDoubleListValue()

 	 * @see #getDoubleListValueStyle()

@@ -1582,11 +1398,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getDoubleListValueStyle_DoubleListValue();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle

-	 * <em>String Value Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle <em>String Value Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>String Value Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle

 	 * @generated

@@ -1594,11 +1408,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getStringValueStyle();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>String Value</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue()

 	 * @see #getStringValueStyle()

@@ -1607,11 +1419,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getStringValueStyle_StringValue();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle

-	 * <em>String List Value Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle <em>String List Value Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>String List Value Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle

 	 * @generated

@@ -1619,11 +1429,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getStringListValueStyle();

 

 	/**

-	 * Returns the meta object for the attribute list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue <em>String List Value</em>}'.

+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue <em>String List Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute list '<em>String List Value</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue()

 	 * @see #getStringListValueStyle()

@@ -1632,11 +1440,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getStringListValueStyle_StringListValue();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * <em>Styled Element</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Styled Element</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

 	 * @generated

@@ -1644,11 +1450,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getStyledElement();

 

 	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}'.

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the containment reference list '<em>Styles</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles()

 	 * @see #getStyledElement()

@@ -1657,26 +1461,19 @@ public interface NattablestylePackage extends EPackage {
 	EReference getStyledElement_Styles();

 

 	/**

-	 * Returns the meta object for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass, java.lang.String)

-	 * <em>Get Named Style</em>}' operation.

+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass, java.lang.String) <em>Get Named Style</em>}' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the '<em>Get Named Style</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass,

-	 *      java.lang.String)

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getNamedStyle(org.eclipse.emf.ecore.EClass, java.lang.String)

 	 * @generated

 	 */

 	EOperation getStyledElement__GetNamedStyle__EClass_String();

 

 	/**

-	 * Returns the meta object for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyle(org.eclipse.emf.ecore.EClass) <em>Get Style</em>}

-	 * ' operation.

+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyle(org.eclipse.emf.ecore.EClass) <em>Get Style</em>}' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the '<em>Get Style</em>' operation.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyle(org.eclipse.emf.ecore.EClass)

 	 * @generated

@@ -1684,12 +1481,9 @@ public interface NattablestylePackage extends EPackage {
 	EOperation getStyledElement__GetStyle__EClass();

 

 	/**

-	 * Returns the meta object for the '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#createStyle(org.eclipse.emf.ecore.EClass)

-	 * <em>Create Style</em>}' operation.

+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#createStyle(org.eclipse.emf.ecore.EClass) <em>Create Style</em>}' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the '<em>Create Style</em>' operation.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#createStyle(org.eclipse.emf.ecore.EClass)

 	 * @generated

@@ -1697,11 +1491,9 @@ public interface NattablestylePackage extends EPackage {
 	EOperation getStyledElement__CreateStyle__EClass();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle

-	 * <em>Table Display Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle <em>Table Display Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Table Display Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle

 	 * @generated

@@ -1709,11 +1501,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getTableDisplayStyle();

 

 	/**

-	 * Returns the meta object for the attribute '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Display Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle()

 	 * @see #getTableDisplayStyle()

@@ -1722,11 +1512,9 @@ public interface NattablestylePackage extends EPackage {
 	EAttribute getTableDisplayStyle_DisplayStyle();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle

-	 * <em>EObject Value Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle <em>EObject Value Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>EObject Value Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle

 	 * @generated

@@ -1734,11 +1522,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getEObjectValueStyle();

 

 	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}'.

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue <em>EObject Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference '<em>EObject Value</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle#getEObjectValue()

 	 * @see #getEObjectValueStyle()

@@ -1747,11 +1533,9 @@ public interface NattablestylePackage extends EPackage {
 	EReference getEObjectValueStyle_EObjectValue();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle

-	 * <em>EObject List Value Style</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle <em>EObject List Value Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>EObject List Value Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle

 	 * @generated

@@ -1759,11 +1543,9 @@ public interface NattablestylePackage extends EPackage {
 	EClass getEObjectListValueStyle();

 

 	/**

-	 * Returns the meta object for the reference list '

-	 * {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue <em>EObject Value</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue <em>EObject Value</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the reference list '<em>EObject Value</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle#getEObjectValue()

 	 * @see #getEObjectListValueStyle()

@@ -1772,11 +1554,9 @@ public interface NattablestylePackage extends EPackage {
 	EReference getEObjectListValueStyle_EObjectValue();

 

 	/**

-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

-	 * <em>Cell Text Alignment</em>}'.

+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for enum '<em>Cell Text Alignment</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

 	 * @generated

@@ -1787,7 +1567,6 @@ public interface NattablestylePackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle <em>Display Style</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for enum '<em>Display Style</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

 	 * @generated

@@ -1798,7 +1577,6 @@ public interface NattablestylePackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -1815,7 +1593,6 @@ public interface NattablestylePackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	interface Literals {

@@ -1824,7 +1601,6 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style <em>Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Style

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyle()

 		 * @generated

@@ -1832,11 +1608,9 @@ public interface NattablestylePackage extends EPackage {
 		EClass STYLE = eINSTANCE.getStyle();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl

-		 * <em>Named Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl <em>Named Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getNamedStyle()

 		 * @generated

@@ -1847,17 +1621,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute NAMED_STYLE__NAME = eINSTANCE.getNamedStyle_Name();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl

-		 * <em>Font Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl <em>Font Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getFontStyle()

 		 * @generated

@@ -1868,7 +1639,6 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Font Color</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FONT_STYLE__FONT_COLOR = eINSTANCE.getFontStyle_FontColor();

@@ -1877,7 +1647,6 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Font Name</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FONT_STYLE__FONT_NAME = eINSTANCE.getFontStyle_FontName();

@@ -1886,7 +1655,6 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Font Height</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FONT_STYLE__FONT_HEIGHT = eINSTANCE.getFontStyle_FontHeight();

@@ -1895,7 +1663,6 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Bold</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FONT_STYLE__BOLD = eINSTANCE.getFontStyle_Bold();

@@ -1904,7 +1671,6 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Italic</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FONT_STYLE__ITALIC = eINSTANCE.getFontStyle_Italic();

@@ -1913,7 +1679,6 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Underline</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FONT_STYLE__UNDERLINE = eINSTANCE.getFontStyle_Underline();

@@ -1922,17 +1687,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Strike Through</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute FONT_STYLE__STRIKE_THROUGH = eINSTANCE.getFontStyle_StrikeThrough();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl

-		 * <em>Cell Text Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl <em>Cell Text Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextStyle()

 		 * @generated

@@ -1943,17 +1705,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Alignment</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute CELL_TEXT_STYLE__ALIGNMENT = eINSTANCE.getCellTextStyle_Alignment();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl

-		 * <em>Int Value Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl <em>Int Value Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntValueStyle()

 		 * @generated

@@ -1964,17 +1723,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Int Value</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute INT_VALUE_STYLE__INT_VALUE = eINSTANCE.getIntValueStyle_IntValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl

-		 * <em>Int List Value Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl <em>Int List Value Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getIntListValueStyle()

 		 * @generated

@@ -1985,17 +1741,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Int List Value</b></em>' attribute list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute INT_LIST_VALUE_STYLE__INT_LIST_VALUE = eINSTANCE.getIntListValueStyle_IntListValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl

-		 * <em>Boolean Value Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl <em>Boolean Value Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanValueStyle()

 		 * @generated

@@ -2006,17 +1759,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Boolean Value</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE = eINSTANCE.getBooleanValueStyle_BooleanValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl

-		 * <em>Boolean List Value Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl <em>Boolean List Value Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getBooleanListValueStyle()

 		 * @generated

@@ -2027,17 +1777,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Boolean List Value</b></em>' attribute list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE = eINSTANCE.getBooleanListValueStyle_BooleanListValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl

-		 * <em>Double Value Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl <em>Double Value Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleValueStyle()

 		 * @generated

@@ -2048,17 +1795,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Double Value</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute DOUBLE_VALUE_STYLE__DOUBLE_VALUE = eINSTANCE.getDoubleValueStyle_DoubleValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl

-		 * <em>Double List Value Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl <em>Double List Value Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDoubleListValueStyle()

 		 * @generated

@@ -2069,17 +1813,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Double List Value</b></em>' attribute list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE = eINSTANCE.getDoubleListValueStyle_DoubleListValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl

-		 * <em>String Value Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl <em>String Value Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringValueStyle()

 		 * @generated

@@ -2090,17 +1831,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>String Value</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute STRING_VALUE_STYLE__STRING_VALUE = eINSTANCE.getStringValueStyle_StringValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl

-		 * <em>String List Value Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl <em>String List Value Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStringListValueStyle()

 		 * @generated

@@ -2111,17 +1849,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>String List Value</b></em>' attribute list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE = eINSTANCE.getStringListValueStyle_StringListValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl

-		 * <em>Styled Element</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl <em>Styled Element</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getStyledElement()

 		 * @generated

@@ -2132,7 +1867,6 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Styles</b></em>' containment reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference STYLED_ELEMENT__STYLES = eINSTANCE.getStyledElement_Styles();

@@ -2141,7 +1875,6 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Get Named Style</b></em>' operation.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EOperation STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING = eINSTANCE.getStyledElement__GetNamedStyle__EClass_String();

@@ -2150,7 +1883,6 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Get Style</b></em>' operation.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EOperation STYLED_ELEMENT___GET_STYLE__ECLASS = eINSTANCE.getStyledElement__GetStyle__EClass();

@@ -2159,17 +1891,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Create Style</b></em>' operation.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EOperation STYLED_ELEMENT___CREATE_STYLE__ECLASS = eINSTANCE.getStyledElement__CreateStyle__EClass();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl

-		 * <em>Table Display Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl <em>Table Display Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getTableDisplayStyle()

 		 * @generated

@@ -2180,17 +1909,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>Display Style</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute TABLE_DISPLAY_STYLE__DISPLAY_STYLE = eINSTANCE.getTableDisplayStyle_DisplayStyle();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl

-		 * <em>EObject Value Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl <em>EObject Value Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectValueStyle()

 		 * @generated

@@ -2201,17 +1927,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>EObject Value</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference EOBJECT_VALUE_STYLE__EOBJECT_VALUE = eINSTANCE.getEObjectValueStyle_EObjectValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl

-		 * <em>EObject List Value Style</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl <em>EObject List Value Style</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getEObjectListValueStyle()

 		 * @generated

@@ -2222,17 +1945,14 @@ public interface NattablestylePackage extends EPackage {
 		 * The meta object literal for the '<em><b>EObject Value</b></em>' reference list feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EReference EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE = eINSTANCE.getEObjectListValueStyle_EObjectValue();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

-		 * <em>Cell Text Alignment</em>}' enum.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment <em>Cell Text Alignment</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextAlignment

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getCellTextAlignment()

 		 * @generated

@@ -2240,11 +1960,9 @@ public interface NattablestylePackage extends EPackage {
 		EEnum CELL_TEXT_ALIGNMENT = eINSTANCE.getCellTextAlignment();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

-		 * <em>Display Style</em>}' enum.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle <em>Display Style</em>}' enum.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NattablestylePackageImpl#getDisplayStyle()

 		 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java
index 179454375c5..dea874605a7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringListValueStyle.java
@@ -25,10 +25,10 @@ import org.eclipse.emf.common.util.EList;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue <em>String List Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle#getStringListValue <em>String List Value</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringListValueStyle()

  * @model

@@ -44,7 +44,6 @@ public interface StringListValueStyle extends NamedStyle {
 	 * If the meaning of the '<em>String List Value</em>' attribute list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>String List Value</em>' attribute list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringListValueStyle_StringListValue()

 	 * @model unique="false"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java
index 492269aa1bf..0087f8403ca 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StringValueStyle.java
@@ -23,10 +23,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringValueStyle()

  * @model

@@ -41,7 +41,6 @@ public interface StringValueStyle extends NamedStyle {
 	 * If the meaning of the '<em>String Value</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>String Value</em>' attribute.

 	 * @see #setStringValue(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStringValueStyle_StringValue()

@@ -51,13 +50,10 @@ public interface StringValueStyle extends NamedStyle {
 	String getStringValue();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue

-	 * <em>String Value</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle#getStringValue <em>String Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>String Value</em>' attribute.

+	 * @param value the new value of the '<em>String Value</em>' attribute.

 	 * @see #getStringValue()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java
index 111aab2184b..0f77e23a50a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/StyledElement.java
@@ -23,10 +23,10 @@ import org.eclipse.emf.ecore.EModelElement;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement#getStyles <em>Styles</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyledElement()

  * @model abstract="true"

@@ -42,7 +42,6 @@ public interface StyledElement extends EModelElement {
 	 * If the meaning of the '<em>Styles</em>' containment reference list isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Styles</em>' containment reference list.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getStyledElement_Styles()

 	 * @model containment="true"

@@ -53,7 +52,6 @@ public interface StyledElement extends EModelElement {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @model

 	 * @generated

 	 */

@@ -62,7 +60,6 @@ public interface StyledElement extends EModelElement {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @model

 	 * @generated

 	 */

@@ -71,7 +68,6 @@ public interface StyledElement extends EModelElement {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @model

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java
index 84d850df394..b89bc423695 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/TableDisplayStyle.java
@@ -19,10 +19,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle;
  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#getTableDisplayStyle()

  * @model

@@ -39,7 +39,6 @@ public interface TableDisplayStyle extends Style {
 	 * If the meaning of the '<em>Display Style</em>' attribute isn't clear, there really should be more of a description here...

 	 * </p>

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the value of the '<em>Display Style</em>' attribute.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

 	 * @see #setDisplayStyle(DisplayStyle)

@@ -50,13 +49,10 @@ public interface TableDisplayStyle extends Style {
 	DisplayStyle getDisplayStyle();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle

-	 * <em>Display Style</em>}' attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle#getDisplayStyle <em>Display Style</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Display Style</em>' attribute.

+	 * @param value the new value of the '<em>Display Style</em>' attribute.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle

 	 * @see #getDisplayStyle()

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java
index 43e5a5ceeb7..d66d5c4a47a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanListValueStyleImpl.java
@@ -26,11 +26,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl#getBooleanListValue <em>Boolean List

- * Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanListValueStyleImpl#getBooleanListValue <em>Boolean List Value</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -40,7 +39,6 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
 	 * The cached value of the '{@link #getBooleanListValue() <em>Boolean List Value</em>}' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getBooleanListValue()

 	 * @generated

 	 * @ordered

@@ -50,7 +48,6 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected BooleanListValueStyleImpl() {

@@ -60,7 +57,6 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -71,12 +67,11 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<Boolean> getBooleanListValue() {

-		if(booleanListValue == null) {

+		if (booleanListValue == null) {

 			booleanListValue = new EDataTypeEList<Boolean>(Boolean.class, this, NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);

 		}

 		return booleanListValue;

@@ -85,14 +80,13 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-			return getBooleanListValue();

+		switch (featureID) {

+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

+				return getBooleanListValue();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -100,17 +94,16 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-			getBooleanListValue().clear();

-			getBooleanListValue().addAll((Collection<? extends Boolean>)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

+				getBooleanListValue().clear();

+				getBooleanListValue().addAll((Collection<? extends Boolean>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -118,15 +111,14 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-			getBooleanListValue().clear();

-			return;

+		switch (featureID) {

+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

+				getBooleanListValue().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -134,14 +126,13 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

-			return booleanListValue != null && !booleanListValue.isEmpty();

+		switch (featureID) {

+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE:

+				return booleanListValue != null && !booleanListValue.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -149,14 +140,12 @@ public class BooleanListValueStyleImpl extends NamedStyleImpl implements Boolean
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (booleanListValue: "); //$NON-NLS-1$

 		result.append(booleanListValue);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java
index 052713ac142..7d494edc6df 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/BooleanValueStyleImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl#isBooleanValue <em>Boolean Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.BooleanValueStyleImpl#isBooleanValue <em>Boolean Value</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -37,7 +37,6 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
 	 * The default value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isBooleanValue()

 	 * @generated

 	 * @ordered

@@ -48,7 +47,6 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
 	 * The cached value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isBooleanValue()

 	 * @generated

 	 * @ordered

@@ -58,7 +56,6 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected BooleanValueStyleImpl() {

@@ -68,7 +65,6 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -79,7 +75,6 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -90,29 +85,26 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setBooleanValue(boolean newBooleanValue) {

 		boolean oldBooleanValue = booleanValue;

 		booleanValue = newBooleanValue;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE, oldBooleanValue, booleanValue));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

-			return isBooleanValue();

+		switch (featureID) {

+			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

+				return isBooleanValue();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -120,15 +112,14 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

-			setBooleanValue((Boolean)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

+				setBooleanValue((Boolean)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -136,15 +127,14 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

-			setBooleanValue(BOOLEAN_VALUE_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

+				setBooleanValue(BOOLEAN_VALUE_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -152,14 +142,13 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

-			return booleanValue != BOOLEAN_VALUE_EDEFAULT;

+		switch (featureID) {

+			case NattablestylePackage.BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE:

+				return booleanValue != BOOLEAN_VALUE_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -167,14 +156,12 @@ public class BooleanValueStyleImpl extends NamedStyleImpl implements BooleanValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (booleanValue: "); //$NON-NLS-1$

 		result.append(booleanValue);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java
index 5ecd894130a..f25af383d1f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/CellTextStyleImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl#getAlignment <em>Alignment</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.CellTextStyleImpl#getAlignment <em>Alignment</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -39,7 +39,6 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
 	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAlignment()

 	 * @generated

 	 * @ordered

@@ -50,7 +49,6 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
 	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getAlignment()

 	 * @generated

 	 * @ordered

@@ -60,7 +58,6 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected CellTextStyleImpl() {

@@ -70,7 +67,6 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -81,7 +77,6 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -92,29 +87,26 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setAlignment(CellTextAlignment newAlignment) {

 		CellTextAlignment oldAlignment = alignment;

 		alignment = newAlignment == null ? ALIGNMENT_EDEFAULT : newAlignment;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT, oldAlignment, alignment));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

-			return getAlignment();

+		switch (featureID) {

+			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

+				return getAlignment();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -122,15 +114,14 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

-			setAlignment((CellTextAlignment)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

+				setAlignment((CellTextAlignment)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -138,15 +129,14 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

-			setAlignment(ALIGNMENT_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

+				setAlignment(ALIGNMENT_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -154,14 +144,13 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

-			return alignment != ALIGNMENT_EDEFAULT;

+		switch (featureID) {

+			case NattablestylePackage.CELL_TEXT_STYLE__ALIGNMENT:

+				return alignment != ALIGNMENT_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -169,14 +158,12 @@ public class CellTextStyleImpl extends EModelElementImpl implements CellTextStyl
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (alignment: "); //$NON-NLS-1$

 		result.append(alignment);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java
index e327725d680..9ed88c986b4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleListValueStyleImpl.java
@@ -26,11 +26,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl#getDoubleListValue <em>Double List Value

- * </em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleListValueStyleImpl#getDoubleListValue <em>Double List Value</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -40,7 +39,6 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
 	 * The cached value of the '{@link #getDoubleListValue() <em>Double List Value</em>}' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDoubleListValue()

 	 * @generated

 	 * @ordered

@@ -50,7 +48,6 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected DoubleListValueStyleImpl() {

@@ -60,7 +57,6 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -71,12 +67,11 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<Double> getDoubleListValue() {

-		if(doubleListValue == null) {

+		if (doubleListValue == null) {

 			doubleListValue = new EDataTypeEList<Double>(Double.class, this, NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);

 		}

 		return doubleListValue;

@@ -85,14 +80,13 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-			return getDoubleListValue();

+		switch (featureID) {

+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

+				return getDoubleListValue();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -100,17 +94,16 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-			getDoubleListValue().clear();

-			getDoubleListValue().addAll((Collection<? extends Double>)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

+				getDoubleListValue().clear();

+				getDoubleListValue().addAll((Collection<? extends Double>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -118,15 +111,14 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-			getDoubleListValue().clear();

-			return;

+		switch (featureID) {

+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

+				getDoubleListValue().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -134,14 +126,13 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

-			return doubleListValue != null && !doubleListValue.isEmpty();

+		switch (featureID) {

+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE:

+				return doubleListValue != null && !doubleListValue.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -149,14 +140,12 @@ public class DoubleListValueStyleImpl extends NamedStyleImpl implements DoubleLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (doubleListValue: "); //$NON-NLS-1$

 		result.append(doubleListValue);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java
index 7204b463371..2055cef1d88 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/DoubleValueStyleImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl#getDoubleValue <em>Double Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.DoubleValueStyleImpl#getDoubleValue <em>Double Value</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -37,7 +37,6 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
 	 * The default value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDoubleValue()

 	 * @generated

 	 * @ordered

@@ -48,7 +47,6 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
 	 * The cached value of the '{@link #getDoubleValue() <em>Double Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDoubleValue()

 	 * @generated

 	 * @ordered

@@ -58,7 +56,6 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected DoubleValueStyleImpl() {

@@ -68,7 +65,6 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -79,7 +75,6 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -90,29 +85,26 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDoubleValue(double newDoubleValue) {

 		double oldDoubleValue = doubleValue;

 		doubleValue = newDoubleValue;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE, oldDoubleValue, doubleValue));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

-			return getDoubleValue();

+		switch (featureID) {

+			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

+				return getDoubleValue();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -120,15 +112,14 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

-			setDoubleValue((Double)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

+				setDoubleValue((Double)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -136,15 +127,14 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

-			setDoubleValue(DOUBLE_VALUE_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

+				setDoubleValue(DOUBLE_VALUE_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -152,14 +142,13 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

-			return doubleValue != DOUBLE_VALUE_EDEFAULT;

+		switch (featureID) {

+			case NattablestylePackage.DOUBLE_VALUE_STYLE__DOUBLE_VALUE:

+				return doubleValue != DOUBLE_VALUE_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -167,14 +156,12 @@ public class DoubleValueStyleImpl extends NamedStyleImpl implements DoubleValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (doubleValue: "); //$NON-NLS-1$

 		result.append(doubleValue);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectListValueStyleImpl.java
index ed836907548..1439b5a3d1e 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectListValueStyleImpl.java
@@ -27,10 +27,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl#getEObjectValue <em>EObject Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectListValueStyleImpl#getEObjectValue <em>EObject Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -40,7 +40,6 @@ public class EObjectListValueStyleImpl extends NamedStyleImpl implements EObject
 	 * The cached value of the '{@link #getEObjectValue() <em>EObject Value</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getEObjectValue()
 	 * @generated
 	 * @ordered
@@ -50,7 +49,6 @@ public class EObjectListValueStyleImpl extends NamedStyleImpl implements EObject
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected EObjectListValueStyleImpl() {
@@ -60,7 +58,6 @@ public class EObjectListValueStyleImpl extends NamedStyleImpl implements EObject
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -71,12 +68,11 @@ public class EObjectListValueStyleImpl extends NamedStyleImpl implements EObject
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public EList<EObject> getEObjectValue() {
-		if(eObjectValue == null) {
+		if (eObjectValue == null) {
 			eObjectValue = new EObjectResolvingEList<EObject>(EObject.class, this, NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE);
 		}
 		return eObjectValue;
@@ -85,14 +81,13 @@ public class EObjectListValueStyleImpl extends NamedStyleImpl implements EObject
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
-			return getEObjectValue();
+		switch (featureID) {
+			case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
+				return getEObjectValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -100,17 +95,16 @@ public class EObjectListValueStyleImpl extends NamedStyleImpl implements EObject
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
-			getEObjectValue().clear();
-			getEObjectValue().addAll((Collection<? extends EObject>)newValue);
-			return;
+		switch (featureID) {
+			case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
+				getEObjectValue().clear();
+				getEObjectValue().addAll((Collection<? extends EObject>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -118,15 +112,14 @@ public class EObjectListValueStyleImpl extends NamedStyleImpl implements EObject
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
-			getEObjectValue().clear();
-			return;
+		switch (featureID) {
+			case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
+				getEObjectValue().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -134,14 +127,13 @@ public class EObjectListValueStyleImpl extends NamedStyleImpl implements EObject
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
-			return eObjectValue != null && !eObjectValue.isEmpty();
+		switch (featureID) {
+			case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE:
+				return eObjectValue != null && !eObjectValue.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectValueStyleImpl.java
index a61ecfb8442..b0bc90a751c 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/EObjectValueStyleImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl#getEObjectValue <em>EObject Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.EObjectValueStyleImpl#getEObjectValue <em>EObject Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -39,7 +39,6 @@ public class EObjectValueStyleImpl extends NamedStyleImpl implements EObjectValu
 	 * The cached value of the '{@link #getEObjectValue() <em>EObject Value</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @see #getEObjectValue()
 	 * @generated
 	 * @ordered
@@ -49,7 +48,6 @@ public class EObjectValueStyleImpl extends NamedStyleImpl implements EObjectValu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected EObjectValueStyleImpl() {
@@ -59,7 +57,6 @@ public class EObjectValueStyleImpl extends NamedStyleImpl implements EObjectValu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -70,18 +67,16 @@ public class EObjectValueStyleImpl extends NamedStyleImpl implements EObjectValu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public EObject getEObjectValue() {
-		if(eObjectValue != null && eObjectValue.eIsProxy()) {
+		if (eObjectValue != null && eObjectValue.eIsProxy()) {
 			InternalEObject oldEObjectValue = (InternalEObject)eObjectValue;
 			eObjectValue = eResolveProxy(oldEObjectValue);
-			if(eObjectValue != oldEObjectValue) {
-				if(eNotificationRequired()) {
+			if (eObjectValue != oldEObjectValue) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE, oldEObjectValue, eObjectValue));
-				}
 			}
 		}
 		return eObjectValue;
@@ -90,7 +85,6 @@ public class EObjectValueStyleImpl extends NamedStyleImpl implements EObjectValu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public EObject basicGetEObjectValue() {
@@ -100,32 +94,27 @@ public class EObjectValueStyleImpl extends NamedStyleImpl implements EObjectValu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void setEObjectValue(EObject newEObjectValue) {
 		EObject oldEObjectValue = eObjectValue;
 		eObjectValue = newEObjectValue;
-		if(eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE, oldEObjectValue, eObjectValue));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch(featureID) {
-		case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
-			if(resolve) {
-				return getEObjectValue();
-			}
-			return basicGetEObjectValue();
+		switch (featureID) {
+			case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+				if (resolve) return getEObjectValue();
+				return basicGetEObjectValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -133,15 +122,14 @@ public class EObjectValueStyleImpl extends NamedStyleImpl implements EObjectValu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch(featureID) {
-		case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
-			setEObjectValue((EObject)newValue);
-			return;
+		switch (featureID) {
+			case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+				setEObjectValue((EObject)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -149,15 +137,14 @@ public class EObjectValueStyleImpl extends NamedStyleImpl implements EObjectValu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch(featureID) {
-		case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
-			setEObjectValue((EObject)null);
-			return;
+		switch (featureID) {
+			case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+				setEObjectValue((EObject)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -165,14 +152,13 @@ public class EObjectValueStyleImpl extends NamedStyleImpl implements EObjectValu
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch(featureID) {
-		case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
-			return eObjectValue != null;
+		switch (featureID) {
+			case NattablestylePackage.EOBJECT_VALUE_STYLE__EOBJECT_VALUE:
+				return eObjectValue != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java
index 868f58d4c82..0f88a81b6f3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/FontStyleImpl.java
@@ -25,16 +25,16 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontColor <em>Font Color</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontName <em>Font Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontHeight <em>Font Height</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isBold <em>Bold</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isItalic <em>Italic</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isUnderline <em>Underline</em>}</li>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isStrikeThrough <em>Strike Through</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontColor <em>Font Color</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontName <em>Font Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#getFontHeight <em>Font Height</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isBold <em>Bold</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isItalic <em>Italic</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isUnderline <em>Underline</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.FontStyleImpl#isStrikeThrough <em>Strike Through</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -44,7 +44,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The default value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getFontColor()

 	 * @generated

 	 * @ordered

@@ -55,7 +54,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The cached value of the '{@link #getFontColor() <em>Font Color</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getFontColor()

 	 * @generated

 	 * @ordered

@@ -66,7 +64,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getFontName()

 	 * @generated

 	 * @ordered

@@ -77,7 +74,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getFontName()

 	 * @generated

 	 * @ordered

@@ -88,7 +84,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The default value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getFontHeight()

 	 * @generated

 	 * @ordered

@@ -99,7 +94,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The cached value of the '{@link #getFontHeight() <em>Font Height</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getFontHeight()

 	 * @generated

 	 * @ordered

@@ -110,7 +104,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The default value of the '{@link #isBold() <em>Bold</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isBold()

 	 * @generated

 	 * @ordered

@@ -121,7 +114,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The cached value of the '{@link #isBold() <em>Bold</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isBold()

 	 * @generated

 	 * @ordered

@@ -132,7 +124,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The default value of the '{@link #isItalic() <em>Italic</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isItalic()

 	 * @generated

 	 * @ordered

@@ -143,7 +134,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The cached value of the '{@link #isItalic() <em>Italic</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isItalic()

 	 * @generated

 	 * @ordered

@@ -154,7 +144,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The default value of the '{@link #isUnderline() <em>Underline</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isUnderline()

 	 * @generated

 	 * @ordered

@@ -165,7 +154,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The cached value of the '{@link #isUnderline() <em>Underline</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isUnderline()

 	 * @generated

 	 * @ordered

@@ -176,7 +164,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The default value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isStrikeThrough()

 	 * @generated

 	 * @ordered

@@ -187,7 +174,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	 * The cached value of the '{@link #isStrikeThrough() <em>Strike Through</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #isStrikeThrough()

 	 * @generated

 	 * @ordered

@@ -197,7 +183,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected FontStyleImpl() {

@@ -207,7 +192,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -218,7 +202,6 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -229,22 +212,19 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setFontColor(int newFontColor) {

 		int oldFontColor = fontColor;

 		fontColor = newFontColor;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_COLOR, oldFontColor, fontColor));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -255,22 +235,19 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setFontName(String newFontName) {

 		String oldFontName = fontName;

 		fontName = newFontName;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_NAME, oldFontName, fontName));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -281,22 +258,19 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setFontHeight(int newFontHeight) {

 		int oldFontHeight = fontHeight;

 		fontHeight = newFontHeight;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__FONT_HEIGHT, oldFontHeight, fontHeight));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -307,22 +281,19 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setBold(boolean newBold) {

 		boolean oldBold = bold;

 		bold = newBold;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__BOLD, oldBold, bold));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -333,22 +304,19 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setItalic(boolean newItalic) {

 		boolean oldItalic = italic;

 		italic = newItalic;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__ITALIC, oldItalic, italic));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -359,22 +327,19 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setUnderline(boolean newUnderline) {

 		boolean oldUnderline = underline;

 		underline = newUnderline;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__UNDERLINE, oldUnderline, underline));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -385,41 +350,38 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setStrikeThrough(boolean newStrikeThrough) {

 		boolean oldStrikeThrough = strikeThrough;

 		strikeThrough = newStrikeThrough;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.FONT_STYLE__STRIKE_THROUGH, oldStrikeThrough, strikeThrough));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.FONT_STYLE__FONT_COLOR:

-			return getFontColor();

-		case NattablestylePackage.FONT_STYLE__FONT_NAME:

-			return getFontName();

-		case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

-			return getFontHeight();

-		case NattablestylePackage.FONT_STYLE__BOLD:

-			return isBold();

-		case NattablestylePackage.FONT_STYLE__ITALIC:

-			return isItalic();

-		case NattablestylePackage.FONT_STYLE__UNDERLINE:

-			return isUnderline();

-		case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

-			return isStrikeThrough();

+		switch (featureID) {

+			case NattablestylePackage.FONT_STYLE__FONT_COLOR:

+				return getFontColor();

+			case NattablestylePackage.FONT_STYLE__FONT_NAME:

+				return getFontName();

+			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

+				return getFontHeight();

+			case NattablestylePackage.FONT_STYLE__BOLD:

+				return isBold();

+			case NattablestylePackage.FONT_STYLE__ITALIC:

+				return isItalic();

+			case NattablestylePackage.FONT_STYLE__UNDERLINE:

+				return isUnderline();

+			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

+				return isStrikeThrough();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -427,33 +389,32 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.FONT_STYLE__FONT_COLOR:

-			setFontColor((Integer)newValue);

-			return;

-		case NattablestylePackage.FONT_STYLE__FONT_NAME:

-			setFontName((String)newValue);

-			return;

-		case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

-			setFontHeight((Integer)newValue);

-			return;

-		case NattablestylePackage.FONT_STYLE__BOLD:

-			setBold((Boolean)newValue);

-			return;

-		case NattablestylePackage.FONT_STYLE__ITALIC:

-			setItalic((Boolean)newValue);

-			return;

-		case NattablestylePackage.FONT_STYLE__UNDERLINE:

-			setUnderline((Boolean)newValue);

-			return;

-		case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

-			setStrikeThrough((Boolean)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.FONT_STYLE__FONT_COLOR:

+				setFontColor((Integer)newValue);

+				return;

+			case NattablestylePackage.FONT_STYLE__FONT_NAME:

+				setFontName((String)newValue);

+				return;

+			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

+				setFontHeight((Integer)newValue);

+				return;

+			case NattablestylePackage.FONT_STYLE__BOLD:

+				setBold((Boolean)newValue);

+				return;

+			case NattablestylePackage.FONT_STYLE__ITALIC:

+				setItalic((Boolean)newValue);

+				return;

+			case NattablestylePackage.FONT_STYLE__UNDERLINE:

+				setUnderline((Boolean)newValue);

+				return;

+			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

+				setStrikeThrough((Boolean)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -461,33 +422,32 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.FONT_STYLE__FONT_COLOR:

-			setFontColor(FONT_COLOR_EDEFAULT);

-			return;

-		case NattablestylePackage.FONT_STYLE__FONT_NAME:

-			setFontName(FONT_NAME_EDEFAULT);

-			return;

-		case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

-			setFontHeight(FONT_HEIGHT_EDEFAULT);

-			return;

-		case NattablestylePackage.FONT_STYLE__BOLD:

-			setBold(BOLD_EDEFAULT);

-			return;

-		case NattablestylePackage.FONT_STYLE__ITALIC:

-			setItalic(ITALIC_EDEFAULT);

-			return;

-		case NattablestylePackage.FONT_STYLE__UNDERLINE:

-			setUnderline(UNDERLINE_EDEFAULT);

-			return;

-		case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

-			setStrikeThrough(STRIKE_THROUGH_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.FONT_STYLE__FONT_COLOR:

+				setFontColor(FONT_COLOR_EDEFAULT);

+				return;

+			case NattablestylePackage.FONT_STYLE__FONT_NAME:

+				setFontName(FONT_NAME_EDEFAULT);

+				return;

+			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

+				setFontHeight(FONT_HEIGHT_EDEFAULT);

+				return;

+			case NattablestylePackage.FONT_STYLE__BOLD:

+				setBold(BOLD_EDEFAULT);

+				return;

+			case NattablestylePackage.FONT_STYLE__ITALIC:

+				setItalic(ITALIC_EDEFAULT);

+				return;

+			case NattablestylePackage.FONT_STYLE__UNDERLINE:

+				setUnderline(UNDERLINE_EDEFAULT);

+				return;

+			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

+				setStrikeThrough(STRIKE_THROUGH_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -495,26 +455,25 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.FONT_STYLE__FONT_COLOR:

-			return fontColor != FONT_COLOR_EDEFAULT;

-		case NattablestylePackage.FONT_STYLE__FONT_NAME:

-			return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);

-		case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

-			return fontHeight != FONT_HEIGHT_EDEFAULT;

-		case NattablestylePackage.FONT_STYLE__BOLD:

-			return bold != BOLD_EDEFAULT;

-		case NattablestylePackage.FONT_STYLE__ITALIC:

-			return italic != ITALIC_EDEFAULT;

-		case NattablestylePackage.FONT_STYLE__UNDERLINE:

-			return underline != UNDERLINE_EDEFAULT;

-		case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

-			return strikeThrough != STRIKE_THROUGH_EDEFAULT;

+		switch (featureID) {

+			case NattablestylePackage.FONT_STYLE__FONT_COLOR:

+				return fontColor != FONT_COLOR_EDEFAULT;

+			case NattablestylePackage.FONT_STYLE__FONT_NAME:

+				return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);

+			case NattablestylePackage.FONT_STYLE__FONT_HEIGHT:

+				return fontHeight != FONT_HEIGHT_EDEFAULT;

+			case NattablestylePackage.FONT_STYLE__BOLD:

+				return bold != BOLD_EDEFAULT;

+			case NattablestylePackage.FONT_STYLE__ITALIC:

+				return italic != ITALIC_EDEFAULT;

+			case NattablestylePackage.FONT_STYLE__UNDERLINE:

+				return underline != UNDERLINE_EDEFAULT;

+			case NattablestylePackage.FONT_STYLE__STRIKE_THROUGH:

+				return strikeThrough != STRIKE_THROUGH_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -522,14 +481,12 @@ public class FontStyleImpl extends EModelElementImpl implements FontStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (fontColor: "); //$NON-NLS-1$

 		result.append(fontColor);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java
index edbac3801d8..6751fc71073 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntListValueStyleImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl#getIntListValue <em>Int List Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntListValueStyleImpl#getIntListValue <em>Int List Value</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -39,7 +39,6 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
 	 * The cached value of the '{@link #getIntListValue() <em>Int List Value</em>}' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getIntListValue()

 	 * @generated

 	 * @ordered

@@ -49,7 +48,6 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected IntListValueStyleImpl() {

@@ -59,7 +57,6 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -70,12 +67,11 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<Integer> getIntListValue() {

-		if(intListValue == null) {

+		if (intListValue == null) {

 			intListValue = new EDataTypeEList<Integer>(Integer.class, this, NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE);

 		}

 		return intListValue;

@@ -84,14 +80,13 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-			return getIntListValue();

+		switch (featureID) {

+			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

+				return getIntListValue();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -99,17 +94,16 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-			getIntListValue().clear();

-			getIntListValue().addAll((Collection<? extends Integer>)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

+				getIntListValue().clear();

+				getIntListValue().addAll((Collection<? extends Integer>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -117,15 +111,14 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-			getIntListValue().clear();

-			return;

+		switch (featureID) {

+			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

+				getIntListValue().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -133,14 +126,13 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

-			return intListValue != null && !intListValue.isEmpty();

+		switch (featureID) {

+			case NattablestylePackage.INT_LIST_VALUE_STYLE__INT_LIST_VALUE:

+				return intListValue != null && !intListValue.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -148,14 +140,12 @@ public class IntListValueStyleImpl extends NamedStyleImpl implements IntListValu
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (intListValue: "); //$NON-NLS-1$

 		result.append(intListValue);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java
index 3f41ea70bf5..8ae6d7b51b0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/IntValueStyleImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl#getIntValue <em>Int Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.IntValueStyleImpl#getIntValue <em>Int Value</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -37,7 +37,6 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
 	 * The default value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getIntValue()

 	 * @generated

 	 * @ordered

@@ -48,7 +47,6 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
 	 * The cached value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getIntValue()

 	 * @generated

 	 * @ordered

@@ -58,7 +56,6 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected IntValueStyleImpl() {

@@ -68,7 +65,6 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -79,7 +75,6 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -90,29 +85,26 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setIntValue(int newIntValue) {

 		int oldIntValue = intValue;

 		intValue = newIntValue;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.INT_VALUE_STYLE__INT_VALUE, oldIntValue, intValue));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

-			return getIntValue();

+		switch (featureID) {

+			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

+				return getIntValue();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -120,15 +112,14 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

-			setIntValue((Integer)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

+				setIntValue((Integer)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -136,15 +127,14 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

-			setIntValue(INT_VALUE_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

+				setIntValue(INT_VALUE_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -152,14 +142,13 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

-			return intValue != INT_VALUE_EDEFAULT;

+		switch (featureID) {

+			case NattablestylePackage.INT_VALUE_STYLE__INT_VALUE:

+				return intValue != INT_VALUE_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -167,14 +156,12 @@ public class IntValueStyleImpl extends NamedStyleImpl implements IntValueStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (intValue: "); //$NON-NLS-1$

 		result.append(intValue);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java
index 6066f0dcd6d..e04f8e41cd8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NamedStyleImpl.java
@@ -25,10 +25,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.NamedStyleImpl#getName <em>Name</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -38,7 +38,6 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getName()

 	 * @generated

 	 * @ordered

@@ -49,7 +48,6 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getName()

 	 * @generated

 	 * @ordered

@@ -59,7 +57,6 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NamedStyleImpl() {

@@ -69,7 +66,6 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -80,7 +76,6 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -91,29 +86,26 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setName(String newName) {

 		String oldName = name;

 		name = newName;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.NAMED_STYLE__NAME, oldName, name));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.NAMED_STYLE__NAME:

-			return getName();

+		switch (featureID) {

+			case NattablestylePackage.NAMED_STYLE__NAME:

+				return getName();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -121,15 +113,14 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.NAMED_STYLE__NAME:

-			setName((String)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.NAMED_STYLE__NAME:

+				setName((String)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -137,15 +128,14 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.NAMED_STYLE__NAME:

-			setName(NAME_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.NAMED_STYLE__NAME:

+				setName(NAME_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -153,14 +143,13 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.NAMED_STYLE__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+		switch (featureID) {

+			case NattablestylePackage.NAMED_STYLE__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -168,14 +157,12 @@ public class NamedStyleImpl extends EModelElementImpl implements NamedStyle {
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (name: "); //$NON-NLS-1$

 		result.append(name);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java
index 8aae9c97c12..6061581b3dd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestyleFactoryImpl.java
@@ -41,7 +41,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisp
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattablestyleFactoryImpl extends EFactoryImpl implements NattablestyleFactory {

@@ -50,16 +49,16 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static NattablestyleFactory init() {

 		try {

 			NattablestyleFactory theNattablestyleFactory = (NattablestyleFactory)EPackage.Registry.INSTANCE.getEFactory(NattablestylePackage.eNS_URI);

-			if(theNattablestyleFactory != null) {

+			if (theNattablestyleFactory != null) {

 				return theNattablestyleFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new NattablestyleFactoryImpl();

@@ -69,7 +68,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattablestyleFactoryImpl() {

@@ -79,85 +77,67 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

-		case NattablestylePackage.NAMED_STYLE:

-			return createNamedStyle();

-		case NattablestylePackage.FONT_STYLE:

-			return createFontStyle();

-		case NattablestylePackage.CELL_TEXT_STYLE:

-			return createCellTextStyle();

-		case NattablestylePackage.INT_VALUE_STYLE:

-			return createIntValueStyle();

-		case NattablestylePackage.INT_LIST_VALUE_STYLE:

-			return createIntListValueStyle();

-		case NattablestylePackage.BOOLEAN_VALUE_STYLE:

-			return createBooleanValueStyle();

-		case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE:

-			return createBooleanListValueStyle();

-		case NattablestylePackage.DOUBLE_VALUE_STYLE:

-			return createDoubleValueStyle();

-		case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE:

-			return createDoubleListValueStyle();

-		case NattablestylePackage.STRING_VALUE_STYLE:

-			return createStringValueStyle();

-		case NattablestylePackage.STRING_LIST_VALUE_STYLE:

-			return createStringListValueStyle();

-		case NattablestylePackage.TABLE_DISPLAY_STYLE:

-			return createTableDisplayStyle();

-		case NattablestylePackage.EOBJECT_VALUE_STYLE:

-			return createEObjectValueStyle();

-		case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE:

-			return createEObjectListValueStyle();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eClass.getClassifierID()) {

+			case NattablestylePackage.NAMED_STYLE: return createNamedStyle();

+			case NattablestylePackage.FONT_STYLE: return createFontStyle();

+			case NattablestylePackage.CELL_TEXT_STYLE: return createCellTextStyle();

+			case NattablestylePackage.INT_VALUE_STYLE: return createIntValueStyle();

+			case NattablestylePackage.INT_LIST_VALUE_STYLE: return createIntListValueStyle();

+			case NattablestylePackage.BOOLEAN_VALUE_STYLE: return createBooleanValueStyle();

+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE: return createBooleanListValueStyle();

+			case NattablestylePackage.DOUBLE_VALUE_STYLE: return createDoubleValueStyle();

+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE: return createDoubleListValueStyle();

+			case NattablestylePackage.STRING_VALUE_STYLE: return createStringValueStyle();

+			case NattablestylePackage.STRING_LIST_VALUE_STYLE: return createStringListValueStyle();

+			case NattablestylePackage.TABLE_DISPLAY_STYLE: return createTableDisplayStyle();

+			case NattablestylePackage.EOBJECT_VALUE_STYLE: return createEObjectValueStyle();

+			case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE: return createEObjectListValueStyle();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object createFromString(EDataType eDataType, String initialValue) {

-		switch(eDataType.getClassifierID()) {

-		case NattablestylePackage.CELL_TEXT_ALIGNMENT:

-			return createCellTextAlignmentFromString(eDataType, initialValue);

-		case NattablestylePackage.DISPLAY_STYLE:

-			return createDisplayStyleFromString(eDataType, initialValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eDataType.getClassifierID()) {

+			case NattablestylePackage.CELL_TEXT_ALIGNMENT:

+				return createCellTextAlignmentFromString(eDataType, initialValue);

+			case NattablestylePackage.DISPLAY_STYLE:

+				return createDisplayStyleFromString(eDataType, initialValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String convertToString(EDataType eDataType, Object instanceValue) {

-		switch(eDataType.getClassifierID()) {

-		case NattablestylePackage.CELL_TEXT_ALIGNMENT:

-			return convertCellTextAlignmentToString(eDataType, instanceValue);

-		case NattablestylePackage.DISPLAY_STYLE:

-			return convertDisplayStyleToString(eDataType, instanceValue);

-		default:

-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eDataType.getClassifierID()) {

+			case NattablestylePackage.CELL_TEXT_ALIGNMENT:

+				return convertCellTextAlignmentToString(eDataType, instanceValue);

+			case NattablestylePackage.DISPLAY_STYLE:

+				return convertDisplayStyleToString(eDataType, instanceValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -169,7 +149,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -181,7 +160,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -193,7 +171,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -205,7 +182,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -217,7 +193,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -229,7 +204,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -241,7 +215,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -253,7 +226,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -265,7 +237,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -277,7 +248,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -289,7 +259,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -301,7 +270,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -313,7 +281,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -325,21 +292,17 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public CellTextAlignment createCellTextAlignmentFromString(EDataType eDataType, String initialValue) {

 		CellTextAlignment result = CellTextAlignment.get(initialValue);

-		if(result == null) {

-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		}

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String convertCellTextAlignmentToString(EDataType eDataType, Object instanceValue) {

@@ -349,21 +312,17 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public DisplayStyle createDisplayStyleFromString(EDataType eDataType, String initialValue) {

 		DisplayStyle result = DisplayStyle.get(initialValue);

-		if(result == null) {

-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-		}

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

 		return result;

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public String convertDisplayStyleToString(EDataType eDataType, Object instanceValue) {

@@ -373,7 +332,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -384,7 +342,6 @@ public class NattablestyleFactoryImpl extends EFactoryImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java
index b7c46187bec..6c1c1eae5d9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/NattablestylePackageImpl.java
@@ -63,7 +63,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.Nat
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattablestylePackageImpl extends EPackageImpl implements NattablestylePackage {

@@ -71,7 +70,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass styleEClass = null;

@@ -79,7 +77,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass namedStyleEClass = null;

@@ -87,7 +84,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass fontStyleEClass = null;

@@ -95,7 +91,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass cellTextStyleEClass = null;

@@ -103,7 +98,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass intValueStyleEClass = null;

@@ -111,7 +105,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass intListValueStyleEClass = null;

@@ -119,7 +112,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass booleanValueStyleEClass = null;

@@ -127,7 +119,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass booleanListValueStyleEClass = null;

@@ -135,7 +126,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass doubleValueStyleEClass = null;

@@ -143,7 +133,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass doubleListValueStyleEClass = null;

@@ -151,7 +140,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass stringValueStyleEClass = null;

@@ -159,7 +147,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass stringListValueStyleEClass = null;

@@ -167,7 +154,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass styledElementEClass = null;

@@ -175,7 +161,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass tableDisplayStyleEClass = null;

@@ -183,7 +168,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass eObjectValueStyleEClass = null;

@@ -191,7 +175,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass eObjectListValueStyleEClass = null;

@@ -199,7 +182,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EEnum cellTextAlignmentEEnum = null;

@@ -207,19 +189,19 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EEnum displayStyleEEnum = null;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

 	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage#eNS_URI

 	 * @see #init()

@@ -232,32 +214,32 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link NattablestylePackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * 

+	 * <p>This method is used to initialize {@link NattablestylePackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static NattablestylePackage init() {

-		if(isInited) {

-			return (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

-		}

+		if (isInited) return (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

+

 		// Obtain or create and register package

 		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablestylePackageImpl());

+

 		isInited = true;

+

 		// Initialize simple dependencies

 		EcorePackage.eINSTANCE.eClass();

+

 		// Obtain or create and register interdependencies

 		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

 		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

@@ -268,6 +250,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 		NattableaxisPackageImpl theNattableaxisPackage = (NattableaxisPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) instanceof NattableaxisPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisPackage.eNS_URI) : NattableaxisPackage.eINSTANCE);

 		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

 		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

+

 		// Create package meta-data objects

 		theNattablestylePackage.createPackageContents();

 		theNattablePackage.createPackageContents();

@@ -279,6 +262,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 		theNattableaxisPackage.createPackageContents();

 		theNattablecellPackage.createPackageContents();

 		theNattableproblemPackage.createPackageContents();

+

 		// Initialize created meta-data

 		theNattablestylePackage.initializePackageContents();

 		theNattablePackage.initializePackageContents();

@@ -290,8 +274,11 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 		theNattableaxisPackage.initializePackageContents();

 		theNattablecellPackage.initializePackageContents();

 		theNattableproblemPackage.initializePackageContents();

+

 		// Mark meta-data to indicate it can't be changed

 		theNattablestylePackage.freeze();

+

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(NattablestylePackage.eNS_URI, theNattablestylePackage);

 		return theNattablestylePackage;

@@ -300,7 +287,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -311,7 +297,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -322,7 +307,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -333,7 +317,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -344,7 +327,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -355,7 +337,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -366,7 +347,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -377,7 +357,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -388,7 +367,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -399,7 +377,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -410,7 +387,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -421,7 +397,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -432,7 +407,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -443,7 +417,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -454,7 +427,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -465,7 +437,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -476,7 +447,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -487,7 +457,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -498,7 +467,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -509,7 +477,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -520,7 +487,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -531,7 +497,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -542,7 +507,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -553,7 +517,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -564,7 +527,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -575,7 +537,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -586,7 +547,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -597,7 +557,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -608,7 +567,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -619,7 +577,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -630,7 +587,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -641,7 +597,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -652,7 +607,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -663,7 +617,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -674,7 +627,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -685,7 +637,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -696,7 +647,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -707,7 +657,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -718,7 +667,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -729,7 +677,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -740,7 +687,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -751,7 +697,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -762,7 +707,6 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -773,28 +717,27 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package. This method is

+	 * Creates the meta-model objects for the package.  This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated) {

-			return;

-		}

+		if (isCreated) return;

 		isCreated = true;

+

 		// Create classes and their features

 		styleEClass = createEClass(STYLE);

+

 		namedStyleEClass = createEClass(NAMED_STYLE);

 		createEAttribute(namedStyleEClass, NAMED_STYLE__NAME);

+

 		fontStyleEClass = createEClass(FONT_STYLE);

 		createEAttribute(fontStyleEClass, FONT_STYLE__FONT_COLOR);

 		createEAttribute(fontStyleEClass, FONT_STYLE__FONT_NAME);

@@ -803,35 +746,49 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 		createEAttribute(fontStyleEClass, FONT_STYLE__ITALIC);

 		createEAttribute(fontStyleEClass, FONT_STYLE__UNDERLINE);

 		createEAttribute(fontStyleEClass, FONT_STYLE__STRIKE_THROUGH);

+

 		cellTextStyleEClass = createEClass(CELL_TEXT_STYLE);

 		createEAttribute(cellTextStyleEClass, CELL_TEXT_STYLE__ALIGNMENT);

+

 		intValueStyleEClass = createEClass(INT_VALUE_STYLE);

 		createEAttribute(intValueStyleEClass, INT_VALUE_STYLE__INT_VALUE);

+

 		intListValueStyleEClass = createEClass(INT_LIST_VALUE_STYLE);

 		createEAttribute(intListValueStyleEClass, INT_LIST_VALUE_STYLE__INT_LIST_VALUE);

+

 		booleanValueStyleEClass = createEClass(BOOLEAN_VALUE_STYLE);

 		createEAttribute(booleanValueStyleEClass, BOOLEAN_VALUE_STYLE__BOOLEAN_VALUE);

+

 		booleanListValueStyleEClass = createEClass(BOOLEAN_LIST_VALUE_STYLE);

 		createEAttribute(booleanListValueStyleEClass, BOOLEAN_LIST_VALUE_STYLE__BOOLEAN_LIST_VALUE);

+

 		doubleValueStyleEClass = createEClass(DOUBLE_VALUE_STYLE);

 		createEAttribute(doubleValueStyleEClass, DOUBLE_VALUE_STYLE__DOUBLE_VALUE);

+

 		doubleListValueStyleEClass = createEClass(DOUBLE_LIST_VALUE_STYLE);

 		createEAttribute(doubleListValueStyleEClass, DOUBLE_LIST_VALUE_STYLE__DOUBLE_LIST_VALUE);

+

 		stringValueStyleEClass = createEClass(STRING_VALUE_STYLE);

 		createEAttribute(stringValueStyleEClass, STRING_VALUE_STYLE__STRING_VALUE);

+

 		stringListValueStyleEClass = createEClass(STRING_LIST_VALUE_STYLE);

 		createEAttribute(stringListValueStyleEClass, STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);

+

 		styledElementEClass = createEClass(STYLED_ELEMENT);

 		createEReference(styledElementEClass, STYLED_ELEMENT__STYLES);

 		createEOperation(styledElementEClass, STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING);

 		createEOperation(styledElementEClass, STYLED_ELEMENT___GET_STYLE__ECLASS);

 		createEOperation(styledElementEClass, STYLED_ELEMENT___CREATE_STYLE__ECLASS);

+

 		tableDisplayStyleEClass = createEClass(TABLE_DISPLAY_STYLE);

 		createEAttribute(tableDisplayStyleEClass, TABLE_DISPLAY_STYLE__DISPLAY_STYLE);

+

 		eObjectValueStyleEClass = createEClass(EOBJECT_VALUE_STYLE);

 		createEReference(eObjectValueStyleEClass, EOBJECT_VALUE_STYLE__EOBJECT_VALUE);

+

 		eObjectListValueStyleEClass = createEClass(EOBJECT_LIST_VALUE_STYLE);

 		createEReference(eObjectListValueStyleEClass, EOBJECT_LIST_VALUE_STYLE__EOBJECT_VALUE);

+

 		// Create enums

 		cellTextAlignmentEEnum = createEEnum(CELL_TEXT_ALIGNMENT);

 		displayStyleEEnum = createEEnum(DISPLAY_STYLE);

@@ -840,32 +797,33 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model. This

+	 * Complete the initialization of the package and its meta-model.  This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized) {

-			return;

-		}

+		if (isInitialized) return;

 		isInitialized = true;

+

 		// Initialize package

 		setName(eNAME);

 		setNsPrefix(eNS_PREFIX);

 		setNsURI(eNS_URI);

+

 		// Obtain other dependent packages

 		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

+

 		// Create type parameters

+

 		// Set bounds for type parameters

+

 		// Add supertypes to classes

 		styleEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

 		namedStyleEClass.getESuperTypes().add(this.getStyle());

@@ -883,10 +841,13 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 		tableDisplayStyleEClass.getESuperTypes().add(this.getStyle());

 		eObjectValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

 		eObjectListValueStyleEClass.getESuperTypes().add(this.getNamedStyle());

+

 		// Initialize classes, features, and operations; add parameters

 		initEClass(styleEClass, Style.class, "Style", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEClass(namedStyleEClass, NamedStyle.class, "NamedStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getNamedStyle_Name(), ecorePackage.getEString(), "name", null, 0, 1, NamedStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(fontStyleEClass, FontStyle.class, "FontStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getFontStyle_FontColor(), ecorePackage.getEInt(), "fontColor", "0", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

 		initEAttribute(getFontStyle_FontName(), ecorePackage.getEString(), "fontName", "Tahoma", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

@@ -895,39 +856,56 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 		initEAttribute(getFontStyle_Italic(), ecorePackage.getEBoolean(), "italic", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

 		initEAttribute(getFontStyle_Underline(), ecorePackage.getEBoolean(), "underline", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

 		initEAttribute(getFontStyle_StrikeThrough(), ecorePackage.getEBoolean(), "strikeThrough", "false", 0, 1, FontStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

+

 		initEClass(cellTextStyleEClass, CellTextStyle.class, "CellTextStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getCellTextStyle_Alignment(), this.getCellTextAlignment(), "alignment", "MIDDLE_LEFT", 0, 1, CellTextStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

+

 		initEClass(intValueStyleEClass, IntValueStyle.class, "IntValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getIntValueStyle_IntValue(), ecorePackage.getEInt(), "intValue", null, 0, 1, IntValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(intListValueStyleEClass, IntListValueStyle.class, "IntListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getIntListValueStyle_IntListValue(), ecorePackage.getEInt(), "intListValue", null, 0, -1, IntListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(booleanValueStyleEClass, BooleanValueStyle.class, "BooleanValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getBooleanValueStyle_BooleanValue(), ecorePackage.getEBoolean(), "booleanValue", null, 0, 1, BooleanValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(booleanListValueStyleEClass, BooleanListValueStyle.class, "BooleanListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getBooleanListValueStyle_BooleanListValue(), ecorePackage.getEBooleanObject(), "booleanListValue", null, 0, -1, BooleanListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(doubleValueStyleEClass, DoubleValueStyle.class, "DoubleValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getDoubleValueStyle_DoubleValue(), ecorePackage.getEDouble(), "doubleValue", null, 0, 1, DoubleValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(doubleListValueStyleEClass, DoubleListValueStyle.class, "DoubleListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getDoubleListValueStyle_DoubleListValue(), ecorePackage.getEDoubleObject(), "doubleListValue", null, 0, -1, DoubleListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(stringValueStyleEClass, StringValueStyle.class, "StringValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getStringValueStyle_StringValue(), ecorePackage.getEString(), "stringValue", null, 0, 1, StringValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(stringListValueStyleEClass, StringListValueStyle.class, "StringListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getStringListValueStyle_StringListValue(), ecorePackage.getEString(), "stringListValue", null, 0, -1, StringListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(styledElementEClass, StyledElement.class, "StyledElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getStyledElement_Styles(), this.getStyle(), null, "styles", null, 0, -1, StyledElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		EOperation op = initEOperation(getStyledElement__GetNamedStyle__EClass_String(), this.getNamedStyle(), "getNamedStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

 		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

 		addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

+

 		op = initEOperation(getStyledElement__GetStyle__EClass(), this.getStyle(), "getStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

 		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

+

 		op = initEOperation(getStyledElement__CreateStyle__EClass(), this.getStyle(), "createStyle", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

 		addEParameter(op, theEcorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(tableDisplayStyleEClass, TableDisplayStyle.class, "TableDisplayStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getTableDisplayStyle_DisplayStyle(), this.getDisplayStyle(), "displayStyle", "NORMAL", 1, 1, TableDisplayStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

+

 		initEClass(eObjectValueStyleEClass, EObjectValueStyle.class, "EObjectValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getEObjectValueStyle_EObjectValue(), ecorePackage.getEObject(), null, "eObjectValue", null, 0, 1, EObjectValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(eObjectListValueStyleEClass, EObjectListValueStyle.class, "EObjectListValueStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getEObjectListValueStyle_EObjectValue(), theEcorePackage.getEObject(), null, "eObjectValue", null, 0, -1, EObjectListValueStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

 		// Initialize enums and add enum literals

 		initEEnum(cellTextAlignmentEEnum, CellTextAlignment.class, "CellTextAlignment"); //$NON-NLS-1$

 		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.TOP_LEFT);

@@ -939,6 +917,7 @@ public class NattablestylePackageImpl extends EPackageImpl implements Nattablest
 		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_LEFT);

 		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_CENTER);

 		addEEnumLiteral(cellTextAlignmentEEnum, CellTextAlignment.BOTTOM_RIGHT);

+

 		initEEnum(displayStyleEEnum, DisplayStyle.class, "DisplayStyle"); //$NON-NLS-1$

 		addEEnumLiteral(displayStyleEEnum, DisplayStyle.NORMAL);

 		addEEnumLiteral(displayStyleEEnum, DisplayStyle.HIERARCHIC_SINGLE_TREE_COLUMN);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java
index eb3a7955b62..8790bd928a3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringListValueStyleImpl.java
@@ -26,11 +26,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringLis
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl#getStringListValue <em>String List Value

- * </em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringListValueStyleImpl#getStringListValue <em>String List Value</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -40,7 +39,6 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
 	 * The cached value of the '{@link #getStringListValue() <em>String List Value</em>}' attribute list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getStringListValue()

 	 * @generated

 	 * @ordered

@@ -50,7 +48,6 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected StringListValueStyleImpl() {

@@ -60,7 +57,6 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -71,12 +67,11 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<String> getStringListValue() {

-		if(stringListValue == null) {

+		if (stringListValue == null) {

 			stringListValue = new EDataTypeEList<String>(String.class, this, NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE);

 		}

 		return stringListValue;

@@ -85,14 +80,13 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-			return getStringListValue();

+		switch (featureID) {

+			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

+				return getStringListValue();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -100,17 +94,16 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-			getStringListValue().clear();

-			getStringListValue().addAll((Collection<? extends String>)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

+				getStringListValue().clear();

+				getStringListValue().addAll((Collection<? extends String>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -118,15 +111,14 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-			getStringListValue().clear();

-			return;

+		switch (featureID) {

+			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

+				getStringListValue().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -134,14 +126,13 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

-			return stringListValue != null && !stringListValue.isEmpty();

+		switch (featureID) {

+			case NattablestylePackage.STRING_LIST_VALUE_STYLE__STRING_LIST_VALUE:

+				return stringListValue != null && !stringListValue.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -149,14 +140,12 @@ public class StringListValueStyleImpl extends NamedStyleImpl implements StringLi
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (stringListValue: "); //$NON-NLS-1$

 		result.append(stringListValue);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java
index 6cc4845895b..4f2cfc652c1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StringValueStyleImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringVal
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl#getStringValue <em>String Value</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StringValueStyleImpl#getStringValue <em>String Value</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -37,7 +37,6 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
 	 * The default value of the '{@link #getStringValue() <em>String Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getStringValue()

 	 * @generated

 	 * @ordered

@@ -48,7 +47,6 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
 	 * The cached value of the '{@link #getStringValue() <em>String Value</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getStringValue()

 	 * @generated

 	 * @ordered

@@ -58,7 +56,6 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected StringValueStyleImpl() {

@@ -68,7 +65,6 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -79,7 +75,6 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -90,29 +85,26 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setStringValue(String newStringValue) {

 		String oldStringValue = stringValue;

 		stringValue = newStringValue;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE, oldStringValue, stringValue));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

-			return getStringValue();

+		switch (featureID) {

+			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

+				return getStringValue();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -120,15 +112,14 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

-			setStringValue((String)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

+				setStringValue((String)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -136,15 +127,14 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

-			setStringValue(STRING_VALUE_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

+				setStringValue(STRING_VALUE_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -152,14 +142,13 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

-			return STRING_VALUE_EDEFAULT == null ? stringValue != null : !STRING_VALUE_EDEFAULT.equals(stringValue);

+		switch (featureID) {

+			case NattablestylePackage.STRING_VALUE_STYLE__STRING_VALUE:

+				return STRING_VALUE_EDEFAULT == null ? stringValue != null : !STRING_VALUE_EDEFAULT.equals(stringValue);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -167,14 +156,12 @@ public class StringValueStyleImpl extends NamedStyleImpl implements StringValueS
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (stringValue: "); //$NON-NLS-1$

 		result.append(stringValue);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java
index 1fe454b0a76..20557c5b31b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/StyledElementImpl.java
@@ -34,10 +34,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl#getStyles <em>Styles</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.StyledElementImpl#getStyles <em>Styles</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -47,7 +47,6 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
 	 * The cached value of the '{@link #getStyles() <em>Styles</em>}' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getStyles()

 	 * @generated

 	 * @ordered

@@ -57,7 +56,6 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected StyledElementImpl() {

@@ -67,7 +65,6 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -78,12 +75,11 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EList<Style> getStyles() {

-		if(styles == null) {

+		if (styles == null) {

 			styles = new EObjectContainmentEList<Style>(Style.class, this, NattablestylePackage.STYLED_ELEMENT__STYLES);

 		}

 		return styles;

@@ -150,14 +146,13 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch(featureID) {

-		case NattablestylePackage.STYLED_ELEMENT__STYLES:

-			return ((InternalEList<?>)getStyles()).basicRemove(otherEnd, msgs);

+		switch (featureID) {

+			case NattablestylePackage.STYLED_ELEMENT__STYLES:

+				return ((InternalEList<?>)getStyles()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -165,14 +160,13 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.STYLED_ELEMENT__STYLES:

-			return getStyles();

+		switch (featureID) {

+			case NattablestylePackage.STYLED_ELEMENT__STYLES:

+				return getStyles();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -180,17 +174,16 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.STYLED_ELEMENT__STYLES:

-			getStyles().clear();

-			getStyles().addAll((Collection<? extends Style>)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.STYLED_ELEMENT__STYLES:

+				getStyles().clear();

+				getStyles().addAll((Collection<? extends Style>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -198,15 +191,14 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.STYLED_ELEMENT__STYLES:

-			getStyles().clear();

-			return;

+		switch (featureID) {

+			case NattablestylePackage.STYLED_ELEMENT__STYLES:

+				getStyles().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -214,14 +206,13 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.STYLED_ELEMENT__STYLES:

-			return styles != null && !styles.isEmpty();

+		switch (featureID) {

+			case NattablestylePackage.STYLED_ELEMENT__STYLES:

+				return styles != null && !styles.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

@@ -229,18 +220,17 @@ public abstract class StyledElementImpl extends EModelElementImpl implements Sty
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch(operationID) {

-		case NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING:

-			return getNamedStyle((EClass)arguments.get(0), (String)arguments.get(1));

-		case NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS:

-			return getStyle((EClass)arguments.get(0));

-		case NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS:

-			return createStyle((EClass)arguments.get(0));

+		switch (operationID) {

+			case NattablestylePackage.STYLED_ELEMENT___GET_NAMED_STYLE__ECLASS_STRING:

+				return getNamedStyle((EClass)arguments.get(0), (String)arguments.get(1));

+			case NattablestylePackage.STYLED_ELEMENT___GET_STYLE__ECLASS:

+				return getStyle((EClass)arguments.get(0));

+			case NattablestylePackage.STYLED_ELEMENT___CREATE_STYLE__ECLASS:

+				return createStyle((EClass)arguments.get(0));

 		}

 		return super.eInvoke(operationID, arguments);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java
index fcf38ad1779..795f2191694 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/impl/TableDisplayStyleImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisp
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl#getDisplayStyle <em>Display Style</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.impl.TableDisplayStyleImpl#getDisplayStyle <em>Display Style</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -39,7 +39,6 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
 	 * The default value of the '{@link #getDisplayStyle() <em>Display Style</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDisplayStyle()

 	 * @generated

 	 * @ordered

@@ -50,7 +49,6 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
 	 * The cached value of the '{@link #getDisplayStyle() <em>Display Style</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getDisplayStyle()

 	 * @generated

 	 * @ordered

@@ -60,7 +58,6 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected TableDisplayStyleImpl() {

@@ -70,7 +67,6 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -81,7 +77,6 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -92,29 +87,26 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setDisplayStyle(DisplayStyle newDisplayStyle) {

 		DisplayStyle oldDisplayStyle = displayStyle;

 		displayStyle = newDisplayStyle == null ? DISPLAY_STYLE_EDEFAULT : newDisplayStyle;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE, oldDisplayStyle, displayStyle));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

-			return getDisplayStyle();

+		switch (featureID) {

+			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

+				return getDisplayStyle();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -122,15 +114,14 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

-			setDisplayStyle((DisplayStyle)newValue);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

+				setDisplayStyle((DisplayStyle)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -138,15 +129,14 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

-			setDisplayStyle(DISPLAY_STYLE_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

+				setDisplayStyle(DISPLAY_STYLE_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -154,14 +144,13 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

-			return displayStyle != DISPLAY_STYLE_EDEFAULT;

+		switch (featureID) {

+			case NattablestylePackage.TABLE_DISPLAY_STYLE__DISPLAY_STYLE:

+				return displayStyle != DISPLAY_STYLE_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -169,14 +158,12 @@ public class TableDisplayStyleImpl extends EModelElementImpl implements TableDis
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (displayStyle: "); //$NON-NLS-1$

 		result.append(displayStyle);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java
index f8775abec36..eea77984996 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleAdapterFactory.java
@@ -40,7 +40,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisp
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage

  * @generated

  */

@@ -50,7 +49,6 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattablestylePackage modelPackage;

@@ -59,11 +57,10 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattablestyleAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattablestylePackage.eINSTANCE;

 		}

 	}

@@ -73,16 +70,15 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

+		if (object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

@@ -92,109 +88,88 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NattablestyleSwitch<Adapter> modelSwitch = new NattablestyleSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseStyle(Style object) {

-			return createStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseNamedStyle(NamedStyle object) {

-			return createNamedStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseFontStyle(FontStyle object) {

-			return createFontStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseCellTextStyle(CellTextStyle object) {

-			return createCellTextStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseIntValueStyle(IntValueStyle object) {

-			return createIntValueStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseIntListValueStyle(IntListValueStyle object) {

-			return createIntListValueStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseBooleanValueStyle(BooleanValueStyle object) {

-			return createBooleanValueStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseBooleanListValueStyle(BooleanListValueStyle object) {

-			return createBooleanListValueStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseDoubleValueStyle(DoubleValueStyle object) {

-			return createDoubleValueStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseDoubleListValueStyle(DoubleListValueStyle object) {

-			return createDoubleListValueStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseStringValueStyle(StringValueStyle object) {

-			return createStringValueStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseStringListValueStyle(StringListValueStyle object) {

-			return createStringListValueStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseStyledElement(StyledElement object) {

-			return createStyledElementAdapter();

-		}

-

-		@Override

-		public Adapter caseTableDisplayStyle(TableDisplayStyle object) {

-			return createTableDisplayStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseEObjectValueStyle(EObjectValueStyle object) {

-			return createEObjectValueStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseEObjectListValueStyle(EObjectListValueStyle object) {

-			return createEObjectListValueStyleAdapter();

-		}

-

-		@Override

-		public Adapter caseEModelElement(EModelElement object) {

-			return createEModelElementAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

+			@Override

+			public Adapter caseStyle(Style object) {

+				return createStyleAdapter();

+			}

+			@Override

+			public Adapter caseNamedStyle(NamedStyle object) {

+				return createNamedStyleAdapter();

+			}

+			@Override

+			public Adapter caseFontStyle(FontStyle object) {

+				return createFontStyleAdapter();

+			}

+			@Override

+			public Adapter caseCellTextStyle(CellTextStyle object) {

+				return createCellTextStyleAdapter();

+			}

+			@Override

+			public Adapter caseIntValueStyle(IntValueStyle object) {

+				return createIntValueStyleAdapter();

+			}

+			@Override

+			public Adapter caseIntListValueStyle(IntListValueStyle object) {

+				return createIntListValueStyleAdapter();

+			}

+			@Override

+			public Adapter caseBooleanValueStyle(BooleanValueStyle object) {

+				return createBooleanValueStyleAdapter();

+			}

+			@Override

+			public Adapter caseBooleanListValueStyle(BooleanListValueStyle object) {

+				return createBooleanListValueStyleAdapter();

+			}

+			@Override

+			public Adapter caseDoubleValueStyle(DoubleValueStyle object) {

+				return createDoubleValueStyleAdapter();

+			}

+			@Override

+			public Adapter caseDoubleListValueStyle(DoubleListValueStyle object) {

+				return createDoubleListValueStyleAdapter();

+			}

+			@Override

+			public Adapter caseStringValueStyle(StringValueStyle object) {

+				return createStringValueStyleAdapter();

+			}

+			@Override

+			public Adapter caseStringListValueStyle(StringListValueStyle object) {

+				return createStringListValueStyleAdapter();

+			}

+			@Override

+			public Adapter caseStyledElement(StyledElement object) {

+				return createStyledElementAdapter();

+			}

+			@Override

+			public Adapter caseTableDisplayStyle(TableDisplayStyle object) {

+				return createTableDisplayStyleAdapter();

+			}

+			@Override

+			public Adapter caseEObjectValueStyle(EObjectValueStyle object) {

+				return createEObjectValueStyleAdapter();

+			}

+			@Override

+			public Adapter caseEObjectListValueStyle(EObjectListValueStyle object) {

+				return createEObjectListValueStyleAdapter();

+			}

+			@Override

+			public Adapter caseEModelElement(EModelElement object) {

+				return createEModelElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *        the object to adapt.

+	 * @param target the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -209,7 +184,6 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	 * 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.nattablestyle.Style

 	 * @generated

@@ -219,13 +193,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle

-	 * <em>Named Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NamedStyle <em>Named Style</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.nattablestyle.NamedStyle

 	 * @generated

@@ -235,13 +207,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle

-	 * <em>Font Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.FontStyle <em>Font Style</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.nattablestyle.FontStyle

 	 * @generated

@@ -251,13 +221,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle

-	 * <em>Cell Text Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.CellTextStyle <em>Cell Text Style</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.nattablestyle.CellTextStyle

 	 * @generated

@@ -267,13 +235,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle

-	 * <em>Int Value Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle <em>Int Value Style</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.nattablestyle.IntValueStyle

 	 * @generated

@@ -283,13 +249,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle

-	 * <em>Int List Value Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntListValueStyle <em>Int List Value Style</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.nattablestyle.IntListValueStyle

 	 * @generated

@@ -299,13 +263,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle

-	 * <em>Boolean Value Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle <em>Boolean Value Style</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.nattablestyle.BooleanValueStyle

 	 * @generated

@@ -315,13 +277,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle

-	 * <em>Boolean List Value Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanListValueStyle <em>Boolean List Value Style</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.nattablestyle.BooleanListValueStyle

 	 * @generated

@@ -331,13 +291,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle

-	 * <em>Double Value Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleValueStyle <em>Double Value Style</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.nattablestyle.DoubleValueStyle

 	 * @generated

@@ -347,13 +305,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle

-	 * <em>Double List Value Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DoubleListValueStyle <em>Double List Value Style</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.nattablestyle.DoubleListValueStyle

 	 * @generated

@@ -363,13 +319,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle

-	 * <em>String Value Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringValueStyle <em>String Value Style</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.nattablestyle.StringValueStyle

 	 * @generated

@@ -379,13 +333,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle

-	 * <em>String List Value Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StringListValueStyle <em>String List Value Style</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.nattablestyle.StringListValueStyle

 	 * @generated

@@ -395,13 +347,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * <em>Styled Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

 	 * @generated

@@ -411,13 +361,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle

-	 * <em>Table Display Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisplayStyle <em>Table Display Style</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.nattablestyle.TableDisplayStyle

 	 * @generated

@@ -427,13 +375,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle

-	 * <em>EObject Value Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectValueStyle <em>EObject Value Style</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.nattablestyle.EObjectValueStyle

 	 * @generated

@@ -443,13 +389,11 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle

-	 * <em>EObject List Value Style</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.EObjectListValueStyle <em>EObject List Value Style</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.nattablestyle.EObjectListValueStyle

 	 * @generated

@@ -464,7 +408,6 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.ecore.EModelElement

 	 * @generated

@@ -478,7 +421,6 @@ public class NattablestyleAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java
index b21a255ec0e..63022df527e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablestyle/util/NattablestyleSwitch.java
@@ -43,7 +43,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.TableDisp
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage

  * @generated

  */

@@ -53,7 +52,6 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattablestylePackage modelPackage;

@@ -62,11 +60,10 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattablestyleSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattablestylePackage.eINSTANCE;

 		}

 	}

@@ -75,8 +72,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

+	 * @param ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

 	 */

@@ -89,279 +85,149 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case NattablestylePackage.STYLE:

-		{

-			Style style = (Style)theEObject;

-			T result = caseStyle(style);

-			if(result == null) {

-				result = caseEModelElement(style);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.NAMED_STYLE:

-		{

-			NamedStyle namedStyle = (NamedStyle)theEObject;

-			T result = caseNamedStyle(namedStyle);

-			if(result == null) {

-				result = caseStyle(namedStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(namedStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.FONT_STYLE:

-		{

-			FontStyle fontStyle = (FontStyle)theEObject;

-			T result = caseFontStyle(fontStyle);

-			if(result == null) {

-				result = caseStyle(fontStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(fontStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.CELL_TEXT_STYLE:

-		{

-			CellTextStyle cellTextStyle = (CellTextStyle)theEObject;

-			T result = caseCellTextStyle(cellTextStyle);

-			if(result == null) {

-				result = caseStyle(cellTextStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(cellTextStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.INT_VALUE_STYLE:

-		{

-			IntValueStyle intValueStyle = (IntValueStyle)theEObject;

-			T result = caseIntValueStyle(intValueStyle);

-			if(result == null) {

-				result = caseNamedStyle(intValueStyle);

-			}

-			if(result == null) {

-				result = caseStyle(intValueStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(intValueStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.INT_LIST_VALUE_STYLE:

-		{

-			IntListValueStyle intListValueStyle = (IntListValueStyle)theEObject;

-			T result = caseIntListValueStyle(intListValueStyle);

-			if(result == null) {

-				result = caseNamedStyle(intListValueStyle);

-			}

-			if(result == null) {

-				result = caseStyle(intListValueStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(intListValueStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.BOOLEAN_VALUE_STYLE:

-		{

-			BooleanValueStyle booleanValueStyle = (BooleanValueStyle)theEObject;

-			T result = caseBooleanValueStyle(booleanValueStyle);

-			if(result == null) {

-				result = caseNamedStyle(booleanValueStyle);

-			}

-			if(result == null) {

-				result = caseStyle(booleanValueStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(booleanValueStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE:

-		{

-			BooleanListValueStyle booleanListValueStyle = (BooleanListValueStyle)theEObject;

-			T result = caseBooleanListValueStyle(booleanListValueStyle);

-			if(result == null) {

-				result = caseNamedStyle(booleanListValueStyle);

-			}

-			if(result == null) {

-				result = caseStyle(booleanListValueStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(booleanListValueStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.DOUBLE_VALUE_STYLE:

-		{

-			DoubleValueStyle doubleValueStyle = (DoubleValueStyle)theEObject;

-			T result = caseDoubleValueStyle(doubleValueStyle);

-			if(result == null) {

-				result = caseNamedStyle(doubleValueStyle);

-			}

-			if(result == null) {

-				result = caseStyle(doubleValueStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(doubleValueStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE:

-		{

-			DoubleListValueStyle doubleListValueStyle = (DoubleListValueStyle)theEObject;

-			T result = caseDoubleListValueStyle(doubleListValueStyle);

-			if(result == null) {

-				result = caseNamedStyle(doubleListValueStyle);

-			}

-			if(result == null) {

-				result = caseStyle(doubleListValueStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(doubleListValueStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.STRING_VALUE_STYLE:

-		{

-			StringValueStyle stringValueStyle = (StringValueStyle)theEObject;

-			T result = caseStringValueStyle(stringValueStyle);

-			if(result == null) {

-				result = caseNamedStyle(stringValueStyle);

-			}

-			if(result == null) {

-				result = caseStyle(stringValueStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(stringValueStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.STRING_LIST_VALUE_STYLE:

-		{

-			StringListValueStyle stringListValueStyle = (StringListValueStyle)theEObject;

-			T result = caseStringListValueStyle(stringListValueStyle);

-			if(result == null) {

-				result = caseNamedStyle(stringListValueStyle);

-			}

-			if(result == null) {

-				result = caseStyle(stringListValueStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(stringListValueStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.STYLED_ELEMENT:

-		{

-			StyledElement styledElement = (StyledElement)theEObject;

-			T result = caseStyledElement(styledElement);

-			if(result == null) {

-				result = caseEModelElement(styledElement);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.TABLE_DISPLAY_STYLE:

-		{

-			TableDisplayStyle tableDisplayStyle = (TableDisplayStyle)theEObject;

-			T result = caseTableDisplayStyle(tableDisplayStyle);

-			if(result == null) {

-				result = caseStyle(tableDisplayStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(tableDisplayStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.EOBJECT_VALUE_STYLE:

-		{

-			EObjectValueStyle eObjectValueStyle = (EObjectValueStyle)theEObject;

-			T result = caseEObjectValueStyle(eObjectValueStyle);

-			if(result == null) {

-				result = caseNamedStyle(eObjectValueStyle);

-			}

-			if(result == null) {

-				result = caseStyle(eObjectValueStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(eObjectValueStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE:

-		{

-			EObjectListValueStyle eObjectListValueStyle = (EObjectListValueStyle)theEObject;

-			T result = caseEObjectListValueStyle(eObjectListValueStyle);

-			if(result == null) {

-				result = caseNamedStyle(eObjectListValueStyle);

-			}

-			if(result == null) {

-				result = caseStyle(eObjectListValueStyle);

-			}

-			if(result == null) {

-				result = caseEModelElement(eObjectListValueStyle);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+		switch (classifierID) {

+			case NattablestylePackage.STYLE: {

+				Style style = (Style)theEObject;

+				T result = caseStyle(style);

+				if (result == null) result = caseEModelElement(style);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.NAMED_STYLE: {

+				NamedStyle namedStyle = (NamedStyle)theEObject;

+				T result = caseNamedStyle(namedStyle);

+				if (result == null) result = caseStyle(namedStyle);

+				if (result == null) result = caseEModelElement(namedStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.FONT_STYLE: {

+				FontStyle fontStyle = (FontStyle)theEObject;

+				T result = caseFontStyle(fontStyle);

+				if (result == null) result = caseStyle(fontStyle);

+				if (result == null) result = caseEModelElement(fontStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.CELL_TEXT_STYLE: {

+				CellTextStyle cellTextStyle = (CellTextStyle)theEObject;

+				T result = caseCellTextStyle(cellTextStyle);

+				if (result == null) result = caseStyle(cellTextStyle);

+				if (result == null) result = caseEModelElement(cellTextStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.INT_VALUE_STYLE: {

+				IntValueStyle intValueStyle = (IntValueStyle)theEObject;

+				T result = caseIntValueStyle(intValueStyle);

+				if (result == null) result = caseNamedStyle(intValueStyle);

+				if (result == null) result = caseStyle(intValueStyle);

+				if (result == null) result = caseEModelElement(intValueStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.INT_LIST_VALUE_STYLE: {

+				IntListValueStyle intListValueStyle = (IntListValueStyle)theEObject;

+				T result = caseIntListValueStyle(intListValueStyle);

+				if (result == null) result = caseNamedStyle(intListValueStyle);

+				if (result == null) result = caseStyle(intListValueStyle);

+				if (result == null) result = caseEModelElement(intListValueStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.BOOLEAN_VALUE_STYLE: {

+				BooleanValueStyle booleanValueStyle = (BooleanValueStyle)theEObject;

+				T result = caseBooleanValueStyle(booleanValueStyle);

+				if (result == null) result = caseNamedStyle(booleanValueStyle);

+				if (result == null) result = caseStyle(booleanValueStyle);

+				if (result == null) result = caseEModelElement(booleanValueStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.BOOLEAN_LIST_VALUE_STYLE: {

+				BooleanListValueStyle booleanListValueStyle = (BooleanListValueStyle)theEObject;

+				T result = caseBooleanListValueStyle(booleanListValueStyle);

+				if (result == null) result = caseNamedStyle(booleanListValueStyle);

+				if (result == null) result = caseStyle(booleanListValueStyle);

+				if (result == null) result = caseEModelElement(booleanListValueStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.DOUBLE_VALUE_STYLE: {

+				DoubleValueStyle doubleValueStyle = (DoubleValueStyle)theEObject;

+				T result = caseDoubleValueStyle(doubleValueStyle);

+				if (result == null) result = caseNamedStyle(doubleValueStyle);

+				if (result == null) result = caseStyle(doubleValueStyle);

+				if (result == null) result = caseEModelElement(doubleValueStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.DOUBLE_LIST_VALUE_STYLE: {

+				DoubleListValueStyle doubleListValueStyle = (DoubleListValueStyle)theEObject;

+				T result = caseDoubleListValueStyle(doubleListValueStyle);

+				if (result == null) result = caseNamedStyle(doubleListValueStyle);

+				if (result == null) result = caseStyle(doubleListValueStyle);

+				if (result == null) result = caseEModelElement(doubleListValueStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.STRING_VALUE_STYLE: {

+				StringValueStyle stringValueStyle = (StringValueStyle)theEObject;

+				T result = caseStringValueStyle(stringValueStyle);

+				if (result == null) result = caseNamedStyle(stringValueStyle);

+				if (result == null) result = caseStyle(stringValueStyle);

+				if (result == null) result = caseEModelElement(stringValueStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.STRING_LIST_VALUE_STYLE: {

+				StringListValueStyle stringListValueStyle = (StringListValueStyle)theEObject;

+				T result = caseStringListValueStyle(stringListValueStyle);

+				if (result == null) result = caseNamedStyle(stringListValueStyle);

+				if (result == null) result = caseStyle(stringListValueStyle);

+				if (result == null) result = caseEModelElement(stringListValueStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.STYLED_ELEMENT: {

+				StyledElement styledElement = (StyledElement)theEObject;

+				T result = caseStyledElement(styledElement);

+				if (result == null) result = caseEModelElement(styledElement);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.TABLE_DISPLAY_STYLE: {

+				TableDisplayStyle tableDisplayStyle = (TableDisplayStyle)theEObject;

+				T result = caseTableDisplayStyle(tableDisplayStyle);

+				if (result == null) result = caseStyle(tableDisplayStyle);

+				if (result == null) result = caseEModelElement(tableDisplayStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.EOBJECT_VALUE_STYLE: {

+				EObjectValueStyle eObjectValueStyle = (EObjectValueStyle)theEObject;

+				T result = caseEObjectValueStyle(eObjectValueStyle);

+				if (result == null) result = caseNamedStyle(eObjectValueStyle);

+				if (result == null) result = caseStyle(eObjectValueStyle);

+				if (result == null) result = caseEModelElement(eObjectValueStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattablestylePackage.EOBJECT_LIST_VALUE_STYLE: {

+				EObjectListValueStyle eObjectListValueStyle = (EObjectListValueStyle)theEObject;

+				T result = caseEObjectListValueStyle(eObjectListValueStyle);

+				if (result == null) result = caseNamedStyle(eObjectListValueStyle);

+				if (result == null) result = caseStyle(eObjectListValueStyle);

+				if (result == null) result = caseEModelElement(eObjectListValueStyle);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -371,9 +237,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -388,9 +252,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Named Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -405,9 +267,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Font Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -422,9 +282,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Cell Text Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -439,9 +297,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Int Value Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -456,9 +312,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Int List Value Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -473,9 +327,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Boolean Value Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -490,9 +342,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Boolean List Value Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -507,9 +357,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Double Value Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -524,9 +372,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Double List Value Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -541,9 +387,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>String Value Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -558,9 +402,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>String List Value Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -575,9 +417,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -592,9 +432,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Table Display Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -609,9 +447,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject Value Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -626,9 +462,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject List Value Style</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -643,9 +477,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -660,9 +492,7 @@ public class NattablestyleSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
index e37bd3e1ac2..988154c209a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
@@ -36,7 +36,6 @@ public interface AbstractTableTester extends StyledElement {
 	 * <!-- begin-model-doc -->

 	 * Returns an object representing the tester

 	 * <!-- end-model-doc -->

-	 *

 	 * @model kind="operation"

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
index e0a4ba3e9c9..82d832c45c1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
@@ -18,17 +18,16 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester;
  * <!-- end-user-doc -->

  *

  * <!-- begin-model-doc -->

- * This class allows to references a JavaTableTester. The Java class is declared with an id, using the extension point

- * org.eclipse.papyrus.infra.nattable.tester.

+ * This class allows to references a JavaTableTester. The Java class is declared with an id, using the extension point org.eclipse.papyrus.infra.nattable.tester.

  * The field tester must be the id declared in this extension point.

  * <!-- end-model-doc -->

  *

  * <p>

  * The following features are supported:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}</li>

  * </ul>

- * </p>

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester()

  * @model

@@ -43,7 +42,6 @@ public interface JavaTableTester extends AbstractTableTester {
 	 * <!-- begin-model-doc -->

 	 * The id of the java tester declared using the extension point org.eclispe.papyrus.infra.nattable.tester

 	 * <!-- end-model-doc -->

-	 *

 	 * @return the value of the '<em>Tester</em>' attribute.

 	 * @see #setTester(String)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester_Tester()

@@ -54,13 +52,10 @@ public interface JavaTableTester extends AbstractTableTester {
 	String getTester();

 

 	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}'

-	 * attribute.

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *        the new value of the '<em>Tester</em>' attribute.

+	 * @param value the new value of the '<em>Tester</em>' attribute.

 	 * @see #getTester()

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
index c1efd082f61..38e53a676cc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage

  * @generated

  */

@@ -29,7 +28,6 @@ public interface NattabletesterFactory extends EFactory {
 	 * The singleton instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattabletesterFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterFactoryImpl.init();

@@ -38,7 +36,6 @@ public interface NattabletesterFactory extends EFactory {
 	 * Returns a new object of class '<em>Java Table Tester</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return a new object of class '<em>Java Table Tester</em>'.

 	 * @generated

 	 */

@@ -48,7 +45,6 @@ public interface NattabletesterFactory extends EFactory {
 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
index bb9feca3f88..1261f3665e0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
@@ -30,7 +30,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.Nattables
  * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory

  * @model kind="package"

  * @generated

@@ -41,7 +40,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The package name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNAME = "nattabletester"; //$NON-NLS-1$

@@ -50,7 +48,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The package namespace URI.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"; //$NON-NLS-1$

@@ -59,7 +56,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The package namespace name.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	String eNS_PREFIX = "nattabletester"; //$NON-NLS-1$

@@ -68,17 +64,14 @@ public interface NattabletesterPackage extends EPackage {
 	 * The singleton instance of the package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	NattabletesterPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl

-	 * <em>Abstract Table Tester</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()

 	 * @generated

@@ -89,7 +82,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -99,7 +91,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -109,7 +100,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The number of structural features of the '<em>Abstract Table Tester</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -119,7 +109,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -129,7 +118,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -139,7 +127,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -149,7 +136,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -159,7 +145,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The operation id for the '<em>Get Tester</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -169,18 +154,15 @@ public interface NattabletesterPackage extends EPackage {
 	 * The number of operations of the '<em>Abstract Table Tester</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int ABSTRACT_TABLE_TESTER_OPERATION_COUNT = NattablestylePackage.STYLED_ELEMENT_OPERATION_COUNT + 1;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl

-	 * <em>Java Table Tester</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()

 	 * @generated

@@ -191,7 +173,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -201,7 +182,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The feature id for the '<em><b>Styles</b></em>' containment reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -211,7 +191,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The feature id for the '<em><b>Tester</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -221,7 +200,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The number of structural features of the '<em>Java Table Tester</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -231,7 +209,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -241,7 +218,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The operation id for the '<em>Get Named Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -251,7 +227,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The operation id for the '<em>Get Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -261,7 +236,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The operation id for the '<em>Create Style</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -271,7 +245,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * The operation id for the '<em>Get Tester</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

@@ -281,18 +254,15 @@ public interface NattabletesterPackage extends EPackage {
 	 * The number of operations of the '<em>Java Table Tester</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 * @ordered

 	 */

 	int JAVA_TABLE_TESTER_OPERATION_COUNT = ABSTRACT_TABLE_TESTER_OPERATION_COUNT + 0;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester

-	 * <em>Abstract Table Tester</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Abstract Table Tester</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester

 	 * @generated

@@ -300,11 +270,9 @@ public interface NattabletesterPackage extends EPackage {
 	EClass getAbstractTableTester();

 

 	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester()

-	 * <em>Get Tester</em>}' operation.

+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester() <em>Get Tester</em>}' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the '<em>Get Tester</em>' operation.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester()

 	 * @generated

@@ -312,11 +280,9 @@ public interface NattabletesterPackage extends EPackage {
 	EOperation getAbstractTableTester__GetTester();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester

-	 * <em>Java Table Tester</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for class '<em>Java Table Tester</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester

 	 * @generated

@@ -324,11 +290,9 @@ public interface NattabletesterPackage extends EPackage {
 	EClass getJavaTableTester();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester

-	 * <em>Tester</em>}'.

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the meta object for the attribute '<em>Tester</em>'.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester()

 	 * @see #getJavaTableTester()

@@ -340,7 +304,6 @@ public interface NattabletesterPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -357,17 +320,14 @@ public interface NattabletesterPackage extends EPackage {
 	 * <li>and each data type</li>

 	 * </ul>

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	interface Literals {

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl

-		 * <em>Abstract Table Tester</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()

 		 * @generated

@@ -378,17 +338,14 @@ public interface NattabletesterPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Get Tester</b></em>' operation.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EOperation ABSTRACT_TABLE_TESTER___GET_TESTER = eINSTANCE.getAbstractTableTester__GetTester();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl

-		 * <em>Java Table Tester</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl

 		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()

 		 * @generated

@@ -399,7 +356,6 @@ public interface NattabletesterPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Tester</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 *

 		 * @generated

 		 */

 		EAttribute JAVA_TABLE_TESTER__TESTER = eINSTANCE.getJavaTableTester_Tester();

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
index 4be18118478..2d5cd33d9ea 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
@@ -24,8 +24,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
  * <!-- begin-user-doc -->

  * An implementation of the model object '<em><b>Abstract Table Tester</b></em>'.

  * <!-- end-user-doc -->

- * <p>

- * </p>

  *

  * @generated

  */

@@ -34,7 +32,6 @@ public abstract class AbstractTableTesterImpl extends StyledElementImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected AbstractTableTesterImpl() {

@@ -44,7 +41,6 @@ public abstract class AbstractTableTesterImpl extends StyledElementImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -55,7 +51,6 @@ public abstract class AbstractTableTesterImpl extends StyledElementImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -68,14 +63,13 @@ public abstract class AbstractTableTesterImpl extends StyledElementImpl implemen
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch(operationID) {

-		case NattabletesterPackage.ABSTRACT_TABLE_TESTER___GET_TESTER:

-			return getTester();

+		switch (operationID) {

+			case NattabletesterPackage.ABSTRACT_TABLE_TESTER___GET_TESTER:

+				return getTester();

 		}

 		return super.eInvoke(operationID, arguments);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
index c13f7106dfd..6b646a62b77 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
@@ -24,10 +24,10 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl#getTester <em>Tester</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl#getTester <em>Tester</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -37,7 +37,6 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
 	 * The default value of the '{@link #getTester() <em>Tester</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getTester()

 	 * @generated

 	 * @ordered

@@ -48,7 +47,6 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
 	 * The cached value of the '{@link #getTester() <em>Tester</em>}' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see #getTester()

 	 * @generated

 	 * @ordered

@@ -58,7 +56,6 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected JavaTableTesterImpl() {

@@ -68,7 +65,6 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -79,7 +75,6 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -90,29 +85,26 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void setTester(String newTester) {

 		String oldTester = tester;

 		tester = newTester;

-		if(eNotificationRequired()) {

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattabletesterPackage.JAVA_TABLE_TESTER__TESTER, oldTester, tester));

-		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch(featureID) {

-		case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-			return getTester();

+		switch (featureID) {

+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

+				return getTester();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -120,15 +112,14 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-			setTester((String)newValue);

-			return;

+		switch (featureID) {

+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

+				setTester((String)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -136,15 +127,14 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-			setTester(TESTER_EDEFAULT);

-			return;

+		switch (featureID) {

+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

+				setTester(TESTER_EDEFAULT);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -152,14 +142,13 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

-			return TESTER_EDEFAULT == null ? tester != null : !TESTER_EDEFAULT.equals(tester);

+		switch (featureID) {

+			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:

+				return TESTER_EDEFAULT == null ? tester != null : !TESTER_EDEFAULT.equals(tester);

 		}

 		return super.eIsSet(featureID);

 	}

@@ -167,14 +156,12 @@ public class JavaTableTesterImpl extends AbstractTableTesterImpl implements Java
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public String toString() {

-		if(eIsProxy()) {

-			return super.toString();

-		}

+		if (eIsProxy()) return super.toString();

+

 		StringBuffer result = new StringBuffer(super.toString());

 		result.append(" (tester: "); //$NON-NLS-1$

 		result.append(tester);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
index db3a595de13..c51ab445db8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
@@ -25,7 +25,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattabletesterFactoryImpl extends EFactoryImpl implements NattabletesterFactory {

@@ -34,16 +33,16 @@ public class NattabletesterFactoryImpl extends EFactoryImpl implements Nattablet
 	 * Creates the default factory implementation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static NattabletesterFactory init() {

 		try {

 			NattabletesterFactory theNattabletesterFactory = (NattabletesterFactory)EPackage.Registry.INSTANCE.getEFactory(NattabletesterPackage.eNS_URI);

-			if(theNattabletesterFactory != null) {

+			if (theNattabletesterFactory != null) {

 				return theNattabletesterFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new NattabletesterFactoryImpl();

@@ -53,7 +52,6 @@ public class NattabletesterFactoryImpl extends EFactoryImpl implements Nattablet
 	 * Creates an instance of the factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattabletesterFactoryImpl() {

@@ -63,23 +61,20 @@ public class NattabletesterFactoryImpl extends EFactoryImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

-		case NattabletesterPackage.JAVA_TABLE_TESTER:

-			return createJavaTableTester();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+		switch (eClass.getClassifierID()) {

+			case NattabletesterPackage.JAVA_TABLE_TESTER: return createJavaTableTester();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -91,7 +86,6 @@ public class NattabletesterFactoryImpl extends EFactoryImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -102,7 +96,6 @@ public class NattabletesterFactoryImpl extends EFactoryImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
index 30e5e8eb8bb..6de42b287b3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
@@ -45,7 +45,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
  * <!-- begin-user-doc -->

  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

- *

  * @generated

  */

 public class NattabletesterPackageImpl extends EPackageImpl implements NattabletesterPackage {

@@ -53,7 +52,6 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass abstractTableTesterEClass = null;

@@ -61,19 +59,19 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private EClass javaTableTesterEClass = null;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

 	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#eNS_URI

 	 * @see #init()

@@ -86,32 +84,32 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link NattabletesterPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly.

-	 * Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

+	 * 

+	 * <p>This method is used to initialize {@link NattabletesterPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static NattabletesterPackage init() {

-		if(isInited) {

-			return (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);

-		}

+		if (isInited) return (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);

+

 		// Obtain or create and register package

 		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattabletesterPackageImpl());

+

 		isInited = true;

+

 		// Initialize simple dependencies

 		EcorePackage.eINSTANCE.eClass();

+

 		// Obtain or create and register interdependencies

 		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);

 		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);

@@ -122,6 +120,7 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 		NattablecellPackageImpl theNattablecellPackage = (NattablecellPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) instanceof NattablecellPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablecellPackage.eNS_URI) : NattablecellPackage.eINSTANCE);

 		NattableproblemPackageImpl theNattableproblemPackage = (NattableproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) instanceof NattableproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableproblemPackage.eNS_URI) : NattableproblemPackage.eINSTANCE);

 		NattablestylePackageImpl theNattablestylePackage = (NattablestylePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) instanceof NattablestylePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI) : NattablestylePackage.eINSTANCE);

+

 		// Create package meta-data objects

 		theNattabletesterPackage.createPackageContents();

 		theNattablePackage.createPackageContents();

@@ -133,6 +132,7 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 		theNattablecellPackage.createPackageContents();

 		theNattableproblemPackage.createPackageContents();

 		theNattablestylePackage.createPackageContents();

+

 		// Initialize created meta-data

 		theNattabletesterPackage.initializePackageContents();

 		theNattablePackage.initializePackageContents();

@@ -144,8 +144,11 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 		theNattablecellPackage.initializePackageContents();

 		theNattableproblemPackage.initializePackageContents();

 		theNattablestylePackage.initializePackageContents();

+

 		// Mark meta-data to indicate it can't be changed

 		theNattabletesterPackage.freeze();

+

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(NattabletesterPackage.eNS_URI, theNattabletesterPackage);

 		return theNattabletesterPackage;

@@ -154,7 +157,6 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -165,7 +167,6 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -176,7 +177,6 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -187,7 +187,6 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -198,7 +197,6 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

@@ -209,27 +207,25 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package. This method is

+	 * Creates the meta-model objects for the package.  This method is

 	 * guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated) {

-			return;

-		}

+		if (isCreated) return;

 		isCreated = true;

+

 		// Create classes and their features

 		abstractTableTesterEClass = createEClass(ABSTRACT_TABLE_TESTER);

 		createEOperation(abstractTableTesterEClass, ABSTRACT_TABLE_TESTER___GET_TESTER);

+

 		javaTableTesterEClass = createEClass(JAVA_TABLE_TESTER);

 		createEAttribute(javaTableTesterEClass, JAVA_TABLE_TESTER__TESTER);

 	}

@@ -237,38 +233,42 @@ public class NattabletesterPackageImpl extends EPackageImpl implements Nattablet
 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model. This

+	 * Complete the initialization of the package and its meta-model.  This

 	 * method is guarded to have no affect on any invocation but its first.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized) {

-			return;

-		}

+		if (isInitialized) return;

 		isInitialized = true;

+

 		// Initialize package

 		setName(eNAME);

 		setNsPrefix(eNS_PREFIX);

 		setNsURI(eNS_URI);

+

 		// Obtain other dependent packages

 		NattablestylePackage theNattablestylePackage = (NattablestylePackage)EPackage.Registry.INSTANCE.getEPackage(NattablestylePackage.eNS_URI);

+

 		// Create type parameters

+

 		// Set bounds for type parameters

+

 		// Add supertypes to classes

 		abstractTableTesterEClass.getESuperTypes().add(theNattablestylePackage.getStyledElement());

 		javaTableTesterEClass.getESuperTypes().add(this.getAbstractTableTester());

+

 		// Initialize classes, features, and operations; add parameters

 		initEClass(abstractTableTesterEClass, AbstractTableTester.class, "AbstractTableTester", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

 		initEOperation(getAbstractTableTester__GetTester(), ecorePackage.getEJavaObject(), "getTester", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

+

 		initEClass(javaTableTesterEClass, JavaTableTester.class, "JavaTableTester", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getJavaTableTester_Tester(), ecorePackage.getEString(), "tester", null, 1, 1, JavaTableTester.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
index 74e3897648c..04f131de6e7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
@@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage

  * @generated

  */

@@ -37,7 +36,6 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattabletesterPackage modelPackage;

@@ -46,11 +44,10 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattabletesterAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattabletesterPackage.eINSTANCE;

 		}

 	}

@@ -60,16 +57,15 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

+		if (object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

@@ -79,44 +75,36 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NattabletesterSwitch<Adapter> modelSwitch = new NattabletesterSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseAbstractTableTester(AbstractTableTester object) {

-			return createAbstractTableTesterAdapter();

-		}

-

-		@Override

-		public Adapter caseJavaTableTester(JavaTableTester object) {

-			return createJavaTableTesterAdapter();

-		}

-

-		@Override

-		public Adapter caseEModelElement(EModelElement object) {

-			return createEModelElementAdapter();

-		}

-

-		@Override

-		public Adapter caseStyledElement(StyledElement object) {

-			return createStyledElementAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

+			@Override

+			public Adapter caseAbstractTableTester(AbstractTableTester object) {

+				return createAbstractTableTesterAdapter();

+			}

+			@Override

+			public Adapter caseJavaTableTester(JavaTableTester object) {

+				return createJavaTableTesterAdapter();

+			}

+			@Override

+			public Adapter caseEModelElement(EModelElement object) {

+				return createEModelElementAdapter();

+			}

+			@Override

+			public Adapter caseStyledElement(StyledElement object) {

+				return createStyledElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *        the object to adapt.

+	 * @param target the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -126,13 +114,11 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester

-	 * <em>Abstract Table Tester</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester

 	 * @generated

@@ -142,13 +128,11 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester

-	 * <em>Java Table Tester</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester

 	 * @generated

@@ -163,7 +147,6 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.ecore.EModelElement

 	 * @generated

@@ -173,13 +156,11 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * <em>Styled Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

 	 * @generated

@@ -193,7 +174,6 @@ public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
index aa9d7ed4917..d9818786d2f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
@@ -30,7 +30,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.Nattable
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage

  * @generated

  */

@@ -40,7 +39,6 @@ public class NattabletesterSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattabletesterPackage modelPackage;

@@ -49,11 +47,10 @@ public class NattabletesterSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattabletesterSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattabletesterPackage.eINSTANCE;

 		}

 	}

@@ -62,8 +59,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

+	 * @param ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

 	 */

@@ -76,48 +72,30 @@ public class NattabletesterSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case NattabletesterPackage.ABSTRACT_TABLE_TESTER:

-		{

-			AbstractTableTester abstractTableTester = (AbstractTableTester)theEObject;

-			T result = caseAbstractTableTester(abstractTableTester);

-			if(result == null) {

-				result = caseStyledElement(abstractTableTester);

-			}

-			if(result == null) {

-				result = caseEModelElement(abstractTableTester);

-			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case NattabletesterPackage.JAVA_TABLE_TESTER:

-		{

-			JavaTableTester javaTableTester = (JavaTableTester)theEObject;

-			T result = caseJavaTableTester(javaTableTester);

-			if(result == null) {

-				result = caseAbstractTableTester(javaTableTester);

-			}

-			if(result == null) {

-				result = caseStyledElement(javaTableTester);

+		switch (classifierID) {

+			case NattabletesterPackage.ABSTRACT_TABLE_TESTER: {

+				AbstractTableTester abstractTableTester = (AbstractTableTester)theEObject;

+				T result = caseAbstractTableTester(abstractTableTester);

+				if (result == null) result = caseStyledElement(abstractTableTester);

+				if (result == null) result = caseEModelElement(abstractTableTester);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = caseEModelElement(javaTableTester);

+			case NattabletesterPackage.JAVA_TABLE_TESTER: {

+				JavaTableTester javaTableTester = (JavaTableTester)theEObject;

+				T result = caseJavaTableTester(javaTableTester);

+				if (result == null) result = caseAbstractTableTester(javaTableTester);

+				if (result == null) result = caseStyledElement(javaTableTester);

+				if (result == null) result = caseEModelElement(javaTableTester);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -127,9 +105,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -144,9 +120,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -161,9 +135,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -178,9 +150,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -195,9 +165,7 @@ public class NattabletesterSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
index 444a325003f..7e3ab2b2523 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
@@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

  * @generated

  */

@@ -37,7 +36,6 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 	 * The cached model package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattablePackage modelPackage;

@@ -46,11 +44,10 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattablePackage.eINSTANCE;

 		}

 	}

@@ -60,16 +57,15 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

+		if (object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

@@ -79,44 +75,36 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NattableSwitch<Adapter> modelSwitch = new NattableSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseTable(Table object) {

-			return createTableAdapter();

-		}

-

-		@Override

-		public Adapter caseEModelElement(EModelElement object) {

-			return createEModelElementAdapter();

-		}

-

-		@Override

-		public Adapter caseStyledElement(StyledElement object) {

-			return createStyledElementAdapter();

-		}

-

-		@Override

-		public Adapter caseTableNamedElement(TableNamedElement object) {

-			return createTableNamedElementAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

+			@Override

+			public Adapter caseTable(Table object) {

+				return createTableAdapter();

+			}

+			@Override

+			public Adapter caseEModelElement(EModelElement object) {

+				return createEModelElementAdapter();

+			}

+			@Override

+			public Adapter caseStyledElement(StyledElement object) {

+				return createStyledElementAdapter();

+			}

+			@Override

+			public Adapter caseTableNamedElement(TableNamedElement object) {

+				return createTableNamedElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *        the object to adapt.

+	 * @param target the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -131,7 +119,6 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table

 	 * @generated

@@ -146,7 +133,6 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.ecore.EModelElement

 	 * @generated

@@ -156,13 +142,11 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

-	 * <em>Styled Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement <em>Styled Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledElement

 	 * @generated

@@ -172,13 +156,11 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

-	 * <em>Table Named Element</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement <em>Table Named Element</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement

 	 * @generated

@@ -192,7 +174,6 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
index 3f035c9a96b..31b73d05b90 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
@@ -30,7 +30,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.StyledEle
  * until a non-null result is returned,

  * which is the result of the switch.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

  * @generated

  */

@@ -40,7 +39,6 @@ public class NattableSwitch<T> extends Switch<T> {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static NattablePackage modelPackage;

@@ -49,11 +47,10 @@ public class NattableSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = NattablePackage.eINSTANCE;

 		}

 	}

@@ -62,8 +59,7 @@ public class NattableSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

+	 * @param ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

 	 */

@@ -76,33 +72,22 @@ public class NattableSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case NattablePackage.TABLE:

-		{

-			Table table = (Table)theEObject;

-			T result = caseTable(table);

-			if(result == null) {

-				result = caseTableNamedElement(table);

-			}

-			if(result == null) {

-				result = caseStyledElement(table);

-			}

-			if(result == null) {

-				result = caseEModelElement(table);

+		switch (classifierID) {

+			case NattablePackage.TABLE: {

+				Table table = (Table)theEObject;

+				T result = caseTable(table);

+				if (result == null) result = caseTableNamedElement(table);

+				if (result == null) result = caseStyledElement(table);

+				if (result == null) result = caseEModelElement(table);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

 			}

-			if(result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -112,9 +97,7 @@ public class NattableSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Table</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -129,9 +112,7 @@ public class NattableSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -146,9 +127,7 @@ public class NattableSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Styled Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -163,9 +142,7 @@ public class NattableSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Table Named Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -180,9 +157,7 @@ public class NattableSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

 	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java
index d23733901eb..6b11d9d6e65 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java
@@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.u
  * <!-- begin-user-doc -->

  * The <b>Validator</b> for the model.

  * <!-- end-user-doc -->

- *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

  * @generated

  */

@@ -37,17 +36,14 @@ public class NattableValidator extends EObjectValidator {
 	 * The cached model package

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public static final NattableValidator INSTANCE = new NattableValidator();

 

 	/**

-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic

-	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

 	 * @generated

@@ -58,7 +54,6 @@ public class NattableValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;

@@ -67,7 +62,6 @@ public class NattableValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

@@ -76,7 +70,6 @@ public class NattableValidator extends EObjectValidator {
 	 * The cached base package validator.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected NattableconfigurationValidator nattableconfigurationValidator;

@@ -85,7 +78,6 @@ public class NattableValidator extends EObjectValidator {
 	 * Creates an instance of the switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public NattableValidator() {

@@ -97,75 +89,48 @@ public class NattableValidator extends EObjectValidator {
 	 * Returns the package of this validator switch.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	protected EPackage getEPackage() {

-		return NattablePackage.eINSTANCE;

+	  return NattablePackage.eINSTANCE;

 	}

 

 	/**

 	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

 	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		switch(classifierID) {

-		case NattablePackage.TABLE:

-			return validateTable((Table)value, diagnostics, context);

-		default:

-			return true;

+		switch (classifierID) {

+			case NattablePackage.TABLE:

+				return validateTable((Table)value, diagnostics, context);

+			default:

+				return true;

 		}

 	}

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTable(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if(!validate_NoCircularContainment(table, diagnostics, context)) {

-			return false;

-		}

+		if (!validate_NoCircularContainment(table, diagnostics, context)) return false;

 		boolean result = validate_EveryMultiplicityConforms(table, diagnostics, context);

-		if(result || diagnostics != null) {

-			result &= validate_EveryDataValueConforms(table, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryReferenceIsContained(table, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryBidirectionalReferenceIsPaired(table, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryProxyResolves(table, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_UniqueID(table, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryKeyUnique(table, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validate_EveryMapEntryUnique(table, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= nattableconfigurationValidator.validateTableNamedElement_nonEmptyName(table, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateTable_currentRowAxisInHistory(table, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateTable_currentColumnAxisInHistory(table, diagnostics, context);

-		}

-		if(result || diagnostics != null) {

-			result &= validateTable_currentAxisProvidersTypes(table, diagnostics, context);

-		}

+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(table, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(table, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(table, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(table, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_UniqueID(table, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(table, diagnostics, context);

+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(table, diagnostics, context);

+		if (result || diagnostics != null) result &= nattableconfigurationValidator.validateTableNamedElement_nonEmptyName(table, diagnostics, context);

+		if (result || diagnostics != null) result &= validateTable_currentRowAxisInHistory(table, diagnostics, context);

+		if (result || diagnostics != null) result &= validateTable_currentColumnAxisInHistory(table, diagnostics, context);

+		if (result || diagnostics != null) result &= validateTable_currentAxisProvidersTypes(table, diagnostics, context);

 		return result;

 	}

 

@@ -173,7 +138,6 @@ public class NattableValidator extends EObjectValidator {
 	 * The cached validation expression for the currentRowAxisInHistory constraint of '<em>Table</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String TABLE__CURRENT_ROW_AXIS_IN_HISTORY__EEXPRESSION = "rowAxisProvidersHistory->includes(currentRowAxisProvider)"; //$NON-NLS-1$

@@ -182,20 +146,27 @@ public class NattableValidator extends EObjectValidator {
 	 * Validates the currentRowAxisInHistory constraint of '<em>Table</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTable_currentRowAxisInHistory(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattablePackage.Literals.TABLE, table, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"currentRowAxisInHistory", //$NON-NLS-1$

-			TABLE__CURRENT_ROW_AXIS_IN_HISTORY__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattablePackage.Literals.TABLE,

+				 table,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "currentRowAxisInHistory", //$NON-NLS-1$

+				 TABLE__CURRENT_ROW_AXIS_IN_HISTORY__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * The cached validation expression for the currentColumnAxisInHistory constraint of '<em>Table</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String TABLE__CURRENT_COLUMN_AXIS_IN_HISTORY__EEXPRESSION = "columnAxisProvidersHistory->includes(currentColumnAxisProvider)"; //$NON-NLS-1$

@@ -204,20 +175,27 @@ public class NattableValidator extends EObjectValidator {
 	 * Validates the currentColumnAxisInHistory constraint of '<em>Table</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTable_currentColumnAxisInHistory(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattablePackage.Literals.TABLE, table, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"currentColumnAxisInHistory", //$NON-NLS-1$

-			TABLE__CURRENT_COLUMN_AXIS_IN_HISTORY__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattablePackage.Literals.TABLE,

+				 table,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "currentColumnAxisInHistory", //$NON-NLS-1$

+				 TABLE__CURRENT_COLUMN_AXIS_IN_HISTORY__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * The cached validation expression for the currentAxisProvidersTypes constraint of '<em>Table</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	protected static final String TABLE__CURRENT_AXIS_PROVIDERS_TYPES__EEXPRESSION = "not (currentRowAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider) and currentColumnAxisProvider.oclIsKindOf(nattableaxisprovider::ISlaveAxisProvider))"; //$NON-NLS-1$

@@ -226,20 +204,27 @@ public class NattableValidator extends EObjectValidator {
 	 * Validates the currentAxisProvidersTypes constraint of '<em>Table</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	public boolean validateTable_currentAxisProvidersTypes(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate(NattablePackage.Literals.TABLE, table, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-			"currentAxisProvidersTypes", //$NON-NLS-1$

-			TABLE__CURRENT_AXIS_PROVIDERS_TYPES__EEXPRESSION, Diagnostic.ERROR, DIAGNOSTIC_SOURCE, 0);

+		return

+			validate

+				(NattablePackage.Literals.TABLE,

+				 table,

+				 diagnostics,

+				 context,

+				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

+				 "currentAxisProvidersTypes", //$NON-NLS-1$

+				 TABLE__CURRENT_AXIS_PROVIDERS_TYPES__EEXPRESSION,

+				 Diagnostic.ERROR,

+				 DIAGNOSTIC_SOURCE,

+				 0);

 	}

 

 	/**

 	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 *

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
index 8d85def7689..ec6f4092307 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
@@ -821,6 +821,10 @@
            description="Context used to display feature referenced by TreeFillingConfiguration"
            id="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
      </context>
+     <context
+           description="Context used to display operation referenced by TreeFillingConfiguration"
+           id="org.eclipse.papyrus.infra.nattable.header.treefilling.operation.labelprovider">
+     </context>
  </extension>
  
  <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
index dd07d585144..71dad5a2983 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
@@ -1,686 +1,688 @@
-/*****************************************************************************

- * Copyright (c) 2012 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.manager.axis;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.widgets.editors.InputDialog;

-import org.eclipse.papyrus.infra.widgets.editors.InputDialogWithLocation;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-

-public abstract class AbstractAxisManager implements IAxisManager {

-

-	/**

-	 * the represented axis manager

-	 */

-	protected AxisManagerRepresentation representedAxisManager;

-

-	/**

-	 * the represented axis provider

-	 */

-	private AbstractAxisProvider representedContentProvider;

-

-	/**

-	 * the global manager for the table

-	 */

-	protected INattableModelManager tableManager;

-

-	/**

-	 * the listener on the axis

-	 */

-	protected Adapter axisListener;

-

-	/**

-	 * the context of the table. We need to keep it, to be able to remove listeners on it, when the table is destroying

-	 */

-	private EObject tableContext;

-

-	/**

-	 * the list of the managed objects

-	 */

-	protected final List<Object> managedObject;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public AbstractAxisManager() {

-		this.managedObject = createManagedObjectList();

-	}

-

-	/**

-	 *

-	 * @return

-	 *         a new managed object list

-	 */

-	protected List<Object> createManagedObjectList() {

-		return new ArrayList<Object>();

-	}

-

-	/**

-	 *

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#init(org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager, java.lang.String,

-	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattablecontentprovider.IAxisContentsProvider)

-	 *

-	 * @param manager

-	 *            the globale table manager

-	 * @param provider

-	 *            the represented axis provider

-	 * @param managerId

-	 *            the id of this manager

-	 */

-	@Override

-	public void init(final INattableModelManager manager, final AxisManagerRepresentation rep, final AbstractAxisProvider provider) {

-		this.tableManager = manager;

-		this.representedAxisManager = rep;

-		this.representedContentProvider = provider;

-		this.tableContext = manager.getTable().getContext();

-		initializeManagedObjectList();

-		addListeners();

-	}

-

-	/**

-	 * add the required listeners

-	 */

-	protected void addListeners() {

-		this.axisListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(final Notification notification) {

-				axisManagerHasChanged(notification);

-			}

-		};

-		this.representedContentProvider.eAdapters().add(this.axisListener);

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            the notification

-	 */

-	protected void axisManagerHasChanged(final Notification notification) {

-		// nothing to do here, for axis manager managing elements stored in the table metamodel, there is nothing to do here, it is done by the Composite Axis Manager

-	}

-

-

-	/**

-	 * Initialise the list of the managed elements

-	 * for axis manager managing elements stored in the table metamodel, there is nothing to do here, it is done by the Composite Axis Manager

-	 */

-	protected void initializeManagedObjectList() {

-		// nothing to do here, for axis manager managing elements stored in the table metamodel, there is nothing to do here, it is done by the Composite Axis Manager

-	}

-

-	/**

-	 * We don't want to save configurations of axis representing EObjects

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canBeSavedAsConfig()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canBeSavedAsConfig() {

-		return false;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getTableManager()

-	 *

-	 * @return

-	 */

-	@Override

-	public NattableModelManager getTableManager() {

-		return (NattableModelManager) this.tableManager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canInsertAxis(java.util.Collection, int)

-	 *

-	 * @param objectsToAdd

-	 * @param index

-	 * @return

-	 */

-	@Override

-	public boolean canInsertAxis(Collection<Object> objectsToAdd, int index) {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canCreateAxisElement(java.lang.String)

-	 *

-	 * @param elementId

-	 * @return

-	 */

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)

-	 *

-	 * @param objectsToAdd

-	 * @return

-	 */

-	@Override

-	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {

-		for (Object object : objectsToAdd) {

-			if (isAllowedContents(object) && !isAlreadyManaged(object)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		removeListeners();

-		this.tableContext = null;

-	}

-

-	/**

-	 * remove the listeners

-	 */

-	protected void removeListeners() {

-		if (this.axisListener != null) {

-			this.representedContentProvider.eAdapters().remove(this.axisListener);

-			this.axisListener = null;

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canBeUsedAsRowManager()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canBeUsedAsRowManager() {

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canBeUsedAsColumnManager()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canBeUsedAsColumnManager() {

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getAddAxisCommand(TransactionalEditingDomain, java.util.Collection)

-	 *

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getInsertAxisCommand(java.util.Collection, int)

-	 *

-	 * @param objectsToAdd

-	 * @param index

-	 * @return

-	 */

-	@Override

-	public Command getInsertAxisCommand(Collection<Object> objectsToAdd, int index) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getComplementaryAddAxisCommand(TransactionalEditingDomain, java.util.Collection)

-	 *

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getComplementaryAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getRepresentedContentProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	public AbstractAxisProvider getRepresentedContentProvider() {

-		return this.representedContentProvider;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#setHeaderDataValue(int, int, java.lang.Object)

-	 *

-	 * @param columnIndex

-	 * @param rowIndex

-	 * @param newValue

-	 */

-	@Override

-	public void setHeaderDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isAllowedContents(java.lang.Object)

-	 *

-	 * @param object

-	 * @return <code>true</code> if the object is not yet represented by an axis

-	 */

-	@Override

-	public boolean isAllowedContents(Object object) {

-		return true;

-	}

-

-	/**

-	 *

-	 * @param object

-	 *            an object

-	 * @return

-	 *         <code>true</code> if the object is already displayed

-	 */

-	@Override

-	public boolean isAlreadyManaged(final Object object) {

-		return getElements().contains(object);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canMoveAxis()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canMoveAxis() {

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#createPossibleAxisContentProvider(boolean)

-	 *

-	 * @param isRestricted

-	 * @return

-	 */

-	@Override

-	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {

-		return null;

-	}

-

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getDestroyAxisCommand(TransactionalEditingDomain, java.util.Collection)

-	 *

-	 * @param domain

-	 * @param objectToDestroy

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisCommand(TransactionalEditingDomain domain, Collection<Object> objectToDestroy) {

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getRepresentedContentProvider());

-		final CompositeCommand compositeCommand = new CompositeCommand("Destroy IAxis Command"); //$NON-NLS-1$

-		for (final IAxis current : getRepresentedContentProvider().getAxis()) {

-			if (current.getManager() == this.representedAxisManager) {

-				if (objectToDestroy.contains(current) || objectToDestroy.contains(current.getElement())) {

-					final DestroyElementRequest request = new DestroyElementRequest(domain, current, false);

-					compositeCommand.add(provider.getEditCommand(request));

-				}

-			}

-		}

-		if (!compositeCommand.isEmpty()) {

-			return new GMFtoEMFCommandWrapper(compositeCommand);

-		}

-		return null;

-

-	}

-

-

-	/**

-	 *

-	 * @return

-	 *         the context of the managed table

-	 */

-	protected final EObject getTableContext() {

-		return this.tableContext;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()

-	 *

-	 * @return

-	 */

-	@Override

-	public List<Object> getAllManagedAxis() {

-		final List<Object> eObjects = new ArrayList<Object>();

-		for (final IAxis current : getRepresentedContentProvider().getAxis()) {

-			if (current.getManager() == this.representedAxisManager) {

-				eObjects.add(current.getElement());

-			}

-		}

-		return eObjects;

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the table

-	 *

-	 * @return

-	 */

-	protected TransactionalEditingDomain getTableEditingDomain() {// Duplicated from NatTableModelManager

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(getTableManager().getTable());

-			return registry.getService(TransactionalEditingDomain.class);

-		} catch (final ServiceException e) {

-			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-

-		return null;

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the context

-	 *

-	 * @return

-	 */

-	protected TransactionalEditingDomain getContextEditingDomain() { // Duplicated from NatTableModelManager

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(getTableContext());

-			return registry.getService(TransactionalEditingDomain.class);

-		} catch (final ServiceException e) {

-			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-		return null;

-	}

-

-	@Override

-	public void moveAxis(Object elementToMove, int newIndex) {

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#openEditAxisAliasDialog(org.eclipse.nebula.widgets.nattable.ui.NatEventData, int)

-	 *

-	 * @param event

-	 * @param axisPosition

-	 */

-	@Override

-	public void openEditAxisAliasDialog(final NatEventData event, int axisPosition) {

-		final IAxis axis = this.representedContentProvider.getAxis().get(axisPosition);

-		String alias = axis.getAlias();

-		if (alias == null) {

-			alias = ""; //$NON-NLS-1$

-		}

-

-		final String dialogMessage = String.format(Messages.AbstractAxisManager_InputDialogMessage, getElementAxisName(axis));

-		Point location = new Point(event.getOriginalEvent().x, event.getOriginalEvent().y);

-		Control natTable = event.getNatTable();

-		location = natTable.toDisplay(location);

-		final InputDialog dialog = new InputDialogWithLocation(Display.getDefault().getActiveShell(), Messages.AbstractAxisManager_InputDialogTitle, dialogMessage, alias, null, location);

-		int result = dialog.open();

-		if (result == IDialogConstants.OK_ID) {

-			String newAlias = dialog.getText();

-			if ("".equals(newAlias)) { //$NON-NLS-1$

-				newAlias = null;

-			}

-			final TransactionalEditingDomain domain = getTableEditingDomain();

-			final SetRequest request = new SetRequest(domain, axis, NattableaxisPackage.eINSTANCE.getIAxis_Alias(), newAlias);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(axis);

-			final ICommand cmd = provider.getEditCommand(request);

-			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-		}

-	}

-

-	/**

-	 * This method mustt be overriden by the children classes

-	 *

-	 * @param axis

-	 *            an axis

-	 * @return

-	 *         <code>null</code> or an {@link UnsupportedOperationException} when the method {@link #canEditAxisHeader()} returns <code>false</code>

-	 */

-	@Override

-	public String getElementAxisName(final IAxis axis) {

-		if (canEditAxisHeader()) {

-			return null;

-		} else {

-			throw new UnsupportedOperationException();

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getAxisManagerRepresentation()

-	 *

-	 * @return

-	 */

-	@Override

-	public AxisManagerRepresentation getAxisManagerRepresentation() {

-		return this.representedAxisManager;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canEditAxisHeader()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canEditAxisHeader() {

-		return false;

-	}

-

-

-	/**

-	 *

-	 * @param axisPositions

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxis(final List<Integer> axisPositions) {

-		if (axisPositions.isEmpty()) {

-			return false;

-		}

-		for (final Integer integer : axisPositions) {

-			if (!canDestroyAxis(integer)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.util.List)

-	 *

-	 * @param axisPositions

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxisElement(List<Integer> axisPositions) {

-		if (axisPositions.isEmpty()) {

-			return false;

-		}

-		for (final Integer integer : axisPositions) {

-			if (!canDestroyAxisElement(integer)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 *

-	 * @param axisPositions

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#destroyAxis(java.util.List)

-	 */

-	@Override

-	public void destroyAxis(final List<Integer> axisPositions) {

-		final List<Object> toDestroy = getElements(axisPositions);

-		TransactionalEditingDomain domain = getTableEditingDomain();

-		final Command cmd = getDestroyAxisCommand(domain, toDestroy);

-		domain.getCommandStack().execute(cmd);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxis(java.lang.Integer)

-	 *

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxis(final Integer axisPosition) {

-		return !isDynamic();

-	}

-

-

-	/**

-	 *

-	 * @param axisPositions

-	 *            axis positions

-	 * @return

-	 *         the elements located at these axis position

-	 */

-	protected List<Object> getElements(final List<Integer> axisPositions) {

-		final List<Object> elements = getElements();

-		final List<Object> toDestroy = new ArrayList<Object>();

-		for (final Integer position : axisPositions) {

-			final Object element = elements.get(position);

-			toDestroy.add(element);

-		}

-		return toDestroy;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#destroyAxisElement(java.util.List)

-	 *

-	 * @param axisPosition

-	 */

-	@Override

-	public void destroyAxisElement(final List<Integer> axisPosition) {

-		final CompoundCommand cmd = new CompoundCommand("Destroy Axis Element Command"); //$NON-NLS-1$

-		TransactionalEditingDomain domain = getContextEditingDomain();

-		for (Integer integer : axisPosition) {

-			cmd.append(getDestroyAxisElementCommand(domain, integer));

-		}

-

-		domain.getCommandStack().execute(cmd);

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the list owning the elements displayed on the managed axis

-	 */

-	protected final List<Object> getElements() {

-		if (isUsedAsColumnManager()) {

-			return this.tableManager.getColumnElementsList();

-		} else {

-			return this.tableManager.getRowElementsList();

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)

-	 *

-	 * @param adapter

-	 * @return

-	 */

-	@Override

-	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {

-		return null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isUsedAsColumnManager()

-	 *

-	 * @return

-	 */

-	@Override

-	public final boolean isUsedAsColumnManager() {

-		final AbstractAxisProvider columnAxisProvider;

-		final Table table = getTableManager().getTable();

-		if (table.isInvertAxis()) {

-			columnAxisProvider = table.getCurrentRowAxisProvider();

-		} else {

-			columnAxisProvider = table.getCurrentColumnAxisProvider();

-		}

-		return columnAxisProvider == getRepresentedContentProvider();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 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.manager.axis;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.widgets.editors.InputDialog;
+import org.eclipse.papyrus.infra.widgets.editors.InputDialogWithLocation;
+import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+
+public abstract class AbstractAxisManager implements IAxisManager {
+
+	/**
+	 * the represented axis manager
+	 */
+	protected AxisManagerRepresentation representedAxisManager;
+
+	/**
+	 * the represented axis provider
+	 */
+	private AbstractAxisProvider representedContentProvider;
+
+	/**
+	 * the global manager for the table
+	 */
+	protected INattableModelManager tableManager;
+
+	/**
+	 * the listener on the axis
+	 */
+	protected Adapter axisListener;
+
+	/**
+	 * the context of the table. We need to keep it, to be able to remove listeners on it, when the table is destroying
+	 */
+	private EObject tableContext;
+
+	/**
+	 * the list of the managed objects
+	 */
+	protected final List<Object> managedObject;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public AbstractAxisManager() {
+		this.managedObject = createManagedObjectList();
+	}
+
+	/**
+	 *
+	 * @return
+	 *         a new managed object list
+	 */
+	protected List<Object> createManagedObjectList() {
+		return new ArrayList<Object>();
+	}
+
+	/**
+	 *
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#init(org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager, java.lang.String,
+	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattablecontentprovider.IAxisContentsProvider)
+	 *
+	 * @param manager
+	 *            the globale table manager
+	 * @param provider
+	 *            the represented axis provider
+	 * @param managerId
+	 *            the id of this manager
+	 */
+	@Override
+	public void init(final INattableModelManager manager, final AxisManagerRepresentation rep, final AbstractAxisProvider provider) {
+		this.tableManager = manager;
+		this.representedAxisManager = rep;
+		this.representedContentProvider = provider;
+		this.tableContext = manager.getTable().getContext();
+		initializeManagedObjectList();
+		addListeners();
+	}
+
+	/**
+	 * add the required listeners
+	 */
+	protected void addListeners() {
+		this.axisListener = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(final Notification notification) {
+				axisManagerHasChanged(notification);
+			}
+		};
+		this.representedContentProvider.eAdapters().add(this.axisListener);
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            the notification
+	 */
+	protected void axisManagerHasChanged(final Notification notification) {
+		// nothing to do here, for axis manager managing elements stored in the table metamodel, there is nothing to do here, it is done by the Composite Axis Manager
+	}
+
+
+	/**
+	 * Initialise the list of the managed elements
+	 * for axis manager managing elements stored in the table metamodel, there is nothing to do here, it is done by the Composite Axis Manager
+	 */
+	protected void initializeManagedObjectList() {
+		// nothing to do here, for axis manager managing elements stored in the table metamodel, there is nothing to do here, it is done by the Composite Axis Manager
+	}
+
+	/**
+	 * We don't want to save configurations of axis representing EObjects
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canBeSavedAsConfig()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canBeSavedAsConfig() {
+		return false;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getTableManager()
+	 *
+	 * @return
+	 */
+	@Override
+	public NattableModelManager getTableManager() {
+		return (NattableModelManager) this.tableManager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canInsertAxis(java.util.Collection, int)
+	 *
+	 * @param objectsToAdd
+	 * @param index
+	 * @return
+	 */
+	@Override
+	public boolean canInsertAxis(Collection<Object> objectsToAdd, int index) {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canCreateAxisElement(java.lang.String)
+	 *
+	 * @param elementId
+	 * @return
+	 */
+	@Override
+	public boolean canCreateAxisElement(String elementId) {
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)
+	 *
+	 * @param objectsToAdd
+	 * @return
+	 */
+	@Override
+	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {
+		for (Object object : objectsToAdd) {
+			if (isAllowedContents(object) && !isAlreadyManaged(object)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.ui.services.IDisposable#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		removeListeners();
+		this.tableContext = null;
+	}
+
+	/**
+	 * remove the listeners
+	 */
+	protected void removeListeners() {
+		if (this.axisListener != null) {
+			this.representedContentProvider.eAdapters().remove(this.axisListener);
+			this.axisListener = null;
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canBeUsedAsRowManager()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canBeUsedAsRowManager() {
+		return true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canBeUsedAsColumnManager()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canBeUsedAsColumnManager() {
+		return true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getAddAxisCommand(TransactionalEditingDomain, java.util.Collection)
+	 *
+	 * @param domain
+	 * @param objectToAdd
+	 * @return
+	 */
+	@Override
+	public Command getAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getInsertAxisCommand(java.util.Collection, int)
+	 *
+	 * @param objectsToAdd
+	 * @param index
+	 * @return
+	 */
+	@Override
+	public Command getInsertAxisCommand(Collection<Object> objectsToAdd, int index) {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getComplementaryAddAxisCommand(TransactionalEditingDomain, java.util.Collection)
+	 *
+	 * @param domain
+	 * @param objectToAdd
+	 * @return
+	 */
+	@Override
+	public Command getComplementaryAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getRepresentedContentProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	public AbstractAxisProvider getRepresentedContentProvider() {
+		return this.representedContentProvider;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#setHeaderDataValue(int, int, java.lang.Object)
+	 *
+	 * @param columnIndex
+	 * @param rowIndex
+	 * @param newValue
+	 */
+	@Override
+	public void setHeaderDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isAllowedContents(java.lang.Object)
+	 *
+	 * @param object
+	 * @return <code>true</code> if the object is not yet represented by an axis
+	 */
+	@Override
+	public boolean isAllowedContents(Object object) {
+		return true;
+	}
+
+	/**
+	 *
+	 * @param object
+	 *            an object
+	 * @return
+	 *         <code>true</code> if the object is already displayed
+	 */
+	@Override
+	public boolean isAlreadyManaged(final Object object) {
+		return getElements().contains(object);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canMoveAxis()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canMoveAxis() {
+		return true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#createPossibleAxisContentProvider(boolean)
+	 *
+	 * @param isRestricted
+	 * @return
+	 */
+	@Override
+	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {
+		return null;
+	}
+
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getDestroyAxisCommand(TransactionalEditingDomain, java.util.Collection)
+	 *
+	 * @param domain
+	 * @param objectToDestroy
+	 * @return
+	 */
+	@Override
+	public Command getDestroyAxisCommand(TransactionalEditingDomain domain, Collection<Object> objectToDestroy) {
+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getRepresentedContentProvider());
+		final CompositeCommand compositeCommand = new CompositeCommand("Destroy IAxis Command"); //$NON-NLS-1$
+		for (final IAxis current : getRepresentedContentProvider().getAxis()) {
+			if (current.getManager() == this.representedAxisManager) {
+				if (objectToDestroy.contains(current) || objectToDestroy.contains(current.getElement())) {
+					final DestroyElementRequest request = new DestroyElementRequest(domain, current, false);
+					compositeCommand.add(provider.getEditCommand(request));
+				}
+			}
+		}
+		if (!compositeCommand.isEmpty()) {
+			return new GMFtoEMFCommandWrapper(compositeCommand);
+		}
+		return null;
+
+	}
+
+
+	/**
+	 *
+	 * @return
+	 *         the context of the managed table
+	 */
+	protected final EObject getTableContext() {
+		return this.tableContext;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()
+	 *
+	 * @return
+	 */
+	@Override
+	public List<Object> getAllManagedAxis() {
+		final List<Object> eObjects = new ArrayList<Object>();
+		for (final IAxis current : getRepresentedContentProvider().getAxis()) {
+			if (current.getManager() == this.representedAxisManager) {
+				eObjects.add(current.getElement());
+			}
+		}
+		return eObjects;
+	}
+
+	/**
+	 * Returns the EditingDomain associated to the table
+	 *
+	 * @return
+	 */
+	protected TransactionalEditingDomain getTableEditingDomain() {// Duplicated from NatTableModelManager
+		ServicesRegistry registry = null;
+		if(null != getTableManager() && null != getTableManager().getTable() && null != getTableManager().getTable().eResource()){
+			try {
+				registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(getTableManager().getTable());
+				return registry.getService(TransactionalEditingDomain.class);
+			} catch (final ServiceException e) {
+				Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Returns the EditingDomain associated to the context
+	 *
+	 * @return
+	 */
+	protected TransactionalEditingDomain getContextEditingDomain() { // Duplicated from NatTableModelManager
+		ServicesRegistry registry = null;
+		try {
+			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(getTableContext());
+			return registry.getService(TransactionalEditingDomain.class);
+		} catch (final ServiceException e) {
+			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);
+		}
+		return null;
+	}
+
+	@Override
+	public void moveAxis(Object elementToMove, int newIndex) {
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#openEditAxisAliasDialog(org.eclipse.nebula.widgets.nattable.ui.NatEventData, int)
+	 *
+	 * @param event
+	 * @param axisPosition
+	 */
+	@Override
+	public void openEditAxisAliasDialog(final NatEventData event, int axisPosition) {
+		final IAxis axis = this.representedContentProvider.getAxis().get(axisPosition);
+		String alias = axis.getAlias();
+		if (alias == null) {
+			alias = ""; //$NON-NLS-1$
+		}
+
+		final String dialogMessage = String.format(Messages.AbstractAxisManager_InputDialogMessage, getElementAxisName(axis));
+		Point location = new Point(event.getOriginalEvent().x, event.getOriginalEvent().y);
+		Control natTable = event.getNatTable();
+		location = natTable.toDisplay(location);
+		final InputDialog dialog = new InputDialogWithLocation(Display.getDefault().getActiveShell(), Messages.AbstractAxisManager_InputDialogTitle, dialogMessage, alias, null, location);
+		int result = dialog.open();
+		if (result == IDialogConstants.OK_ID) {
+			String newAlias = dialog.getText();
+			if ("".equals(newAlias)) { //$NON-NLS-1$
+				newAlias = null;
+			}
+			final TransactionalEditingDomain domain = getTableEditingDomain();
+			final SetRequest request = new SetRequest(domain, axis, NattableaxisPackage.eINSTANCE.getIAxis_Alias(), newAlias);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(axis);
+			final ICommand cmd = provider.getEditCommand(request);
+			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+		}
+	}
+
+	/**
+	 * This method mustt be overriden by the children classes
+	 *
+	 * @param axis
+	 *            an axis
+	 * @return
+	 *         <code>null</code> or an {@link UnsupportedOperationException} when the method {@link #canEditAxisHeader()} returns <code>false</code>
+	 */
+	@Override
+	public String getElementAxisName(final IAxis axis) {
+		if (canEditAxisHeader()) {
+			return null;
+		} else {
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getAxisManagerRepresentation()
+	 *
+	 * @return
+	 */
+	@Override
+	public AxisManagerRepresentation getAxisManagerRepresentation() {
+		return this.representedAxisManager;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canEditAxisHeader()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canEditAxisHeader() {
+		return false;
+	}
+
+
+	/**
+	 *
+	 * @param axisPositions
+	 * @return
+	 */
+	@Override
+	public boolean canDestroyAxis(final List<Integer> axisPositions) {
+		if (axisPositions.isEmpty()) {
+			return false;
+		}
+		for (final Integer integer : axisPositions) {
+			if (!canDestroyAxis(integer)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.util.List)
+	 *
+	 * @param axisPositions
+	 * @return
+	 */
+	@Override
+	public boolean canDestroyAxisElement(List<Integer> axisPositions) {
+		if (axisPositions.isEmpty()) {
+			return false;
+		}
+		for (final Integer integer : axisPositions) {
+			if (!canDestroyAxisElement(integer)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 *
+	 * @param axisPositions
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#destroyAxis(java.util.List)
+	 */
+	@Override
+	public void destroyAxis(final List<Integer> axisPositions) {
+		final List<Object> toDestroy = getElements(axisPositions);
+		TransactionalEditingDomain domain = getTableEditingDomain();
+		final Command cmd = getDestroyAxisCommand(domain, toDestroy);
+		domain.getCommandStack().execute(cmd);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxis(java.lang.Integer)
+	 *
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public boolean canDestroyAxis(final Integer axisPosition) {
+		return !isDynamic();
+	}
+
+
+	/**
+	 *
+	 * @param axisPositions
+	 *            axis positions
+	 * @return
+	 *         the elements located at these axis position
+	 */
+	protected List<Object> getElements(final List<Integer> axisPositions) {
+		final List<Object> elements = getElements();
+		final List<Object> toDestroy = new ArrayList<Object>();
+		for (final Integer position : axisPositions) {
+			final Object element = elements.get(position);
+			toDestroy.add(element);
+		}
+		return toDestroy;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#destroyAxisElement(java.util.List)
+	 *
+	 * @param axisPosition
+	 */
+	@Override
+	public void destroyAxisElement(final List<Integer> axisPosition) {
+		final CompoundCommand cmd = new CompoundCommand("Destroy Axis Element Command"); //$NON-NLS-1$
+		TransactionalEditingDomain domain = getContextEditingDomain();
+		for (Integer integer : axisPosition) {
+			cmd.append(getDestroyAxisElementCommand(domain, integer));
+		}
+
+		domain.getCommandStack().execute(cmd);
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the list owning the elements displayed on the managed axis
+	 */
+	protected final List<Object> getElements() {
+		if (isUsedAsColumnManager()) {
+			return this.tableManager.getColumnElementsList();
+		} else {
+			return this.tableManager.getRowElementsList();
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
+	 *
+	 * @param adapter
+	 * @return
+	 */
+	@Override
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+		return null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isUsedAsColumnManager()
+	 *
+	 * @return
+	 */
+	@Override
+	public final boolean isUsedAsColumnManager() {
+		final AbstractAxisProvider columnAxisProvider;
+		final Table table = getTableManager().getTable();
+		if (table.isInvertAxis()) {
+			columnAxisProvider = table.getCurrentRowAxisProvider();
+		} else {
+			columnAxisProvider = table.getCurrentColumnAxisProvider();
+		}
+		return columnAxisProvider == getRepresentedContentProvider();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java
index c93afc100f7..dc5e75c1203 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractTreeAxisManagerForEventList.java
@@ -1,1295 +1,1228 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * 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:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-import java.util.TreeSet;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.RollbackException;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.hideshow.RowHideShowLayer;

-import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiRowHideCommand;

-import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiRowShowCommand;

-import org.eclipse.nebula.widgets.nattable.layer.ILayer;

-import org.eclipse.nebula.widgets.nattable.sort.ISortModel;

-import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;

-import org.eclipse.papyrus.commands.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;

-import org.eclipse.papyrus.infra.nattable.layer.PapyrusGridLayer;

-import org.eclipse.papyrus.infra.nattable.layerstack.RowHeaderHierarchicalLayerStack;

-import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;

-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.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-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.tree.ITreeItemAxisHelper;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.utils.EventListHelper;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;

-

-

-/**

- * @author VL222926

- *

- */

-public abstract class AbstractTreeAxisManagerForEventList extends AbstractAxisManagerForEventList implements ITreeItemAxisManagerForEventList {

-

-	/**

-	 * a map with the elements managed by this axis manager : keys are semantic elements and values a set of the representation of these elements in the table

-	 */

-	protected Map<Object, Set<ITreeItemAxis>> managedElements = new HashMap<Object, Set<ITreeItemAxis>>();

-

-	/**

-	 * the list of axis which have been expanded one time

-	 */

-	protected List<ITreeItemAxis> alreadyExpanded = new ArrayList<ITreeItemAxis>();

-

-	/**

-	 * the current filling configuration used by this axis manager

-	 */

-	protected List<TreeFillingConfiguration> currentFillingConfiguration;

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#init(org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager, org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation,

-	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider)

-	 *

-	 * @param manager

-	 * @param rep

-	 * @param provider

-	 */

-	@Override

-	public void init(INattableModelManager manager, AxisManagerRepresentation rep, AbstractAxisProvider provider) {

-		super.init(manager, rep, provider);

-		this.currentFillingConfiguration = FillingConfigurationUtils.getTreeFillingConfiguration(getTable(), representedAxisManager);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#addListeners()

-	 *

-	 */

-	@Override

-	protected void addListeners() {

-		// nothing to do here

-	}

-

-	/**

-	 *

-	 * @param parentAxis

-	 *            the parent axis

-	 * @param objectToAdd

-	 *            the object to add as child of the parent axis

-	 * @return

-	 *         the created {@link ITreeItemAxis} representing objectToAdd

-	 */

-	protected final ITreeItemAxis addObject(final ITreeItemAxis parentAxis, final Object objectToAdd) {

-		final ITreeItemAxis newAxis = createITreeItemAxis(parentAxis, objectToAdd);

-		if (objectToAdd instanceof TreeFillingConfiguration) {

-			TreeFillingConfiguration conf = (TreeFillingConfiguration) objectToAdd;

-			if (this.alreadyExpanded.contains(parentAxis)) {

-				// if the representation of the notifier has already been expanded, we need to add the new value to the list, if not it will be done during the expand of the notifier

-				// we must to expand tree filling configuration when its is hidden and its parent is expanded

-				if (StyleUtils.isHiddenDepth(getTableManager(), conf.getDepth())) {

-

-

-					try {

-						GMFUnsafe.write(getTableEditingDomain(), new Runnable() {

-

-							@Override

-							public void run() {

-								newAxis.setExpanded(true);

-							}

-						});

-					} catch (InterruptedException e) {

-						Activator.log.error(e);

-					} catch (RollbackException e) {

-						Activator.log.error(e);

-					}

-					this.alreadyExpanded.add(newAxis);

-				}

-			}

-		}

-		ITreeItemAxisHelper.linkITreeItemAxisToSemanticElement(this.managedElements, newAxis);

-		EventListHelper.addToEventList(this.eventList, newAxis);

-		// seems not useful, but in doubt, I don't remove the code

-

-		// int index = ((NattableModelManager) getTableManager()).getRowElementsList().indexOf(newAxis);

-		// NatTable natTable = (NatTable) getTableManager().getAdapter(NatTable.class);

-		// if (getTableManager() != null && getTableManager().getBodyLayerStack() != null) {

-		// RowHideShowLayer rowHideLayer = getTableManager().getBodyLayerStack().getRowHideShowLayer();

-		// if (index != -1 && natTable != null && rowHideLayer != null) {

-		// // we need to notify the show hide layer than an object has been added

-		//

-		// TreeLayer treeLayer = getTreeLayer();

-		// RowInsertEvent event = new RowInsertEvent(treeLayer, index);

-		// rowHideLayer.handleLayerEvent(event);

-		// }

-		// }

-		return newAxis;

-	}

-

-

-	/**

-	 * TODO : find a better way to get the tree layer

-	 *

-	 * @return

-	 *         the tree layer

-	 */

-	private TreeLayer getTreeLayer() {

-		NatTable natTable = (NatTable) getTableManager().getAdapter(NatTable.class);

-		ILayer layer = natTable.getLayer();

-		if (layer instanceof PapyrusGridLayer) {

-			PapyrusGridLayer gridLayer = (PapyrusGridLayer) layer;

-			ILayer rowLayer = gridLayer.getRowHeaderLayer();

-			if (rowLayer instanceof RowHeaderHierarchicalLayerStack) {

-				return ((RowHeaderHierarchicalLayerStack) rowLayer).getTreeLayer();

-			}

-		}

-		throw new UnknownError("TreeLayer has not been found"); //$NON-NLS-1$

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsColumnManager()

-	 *

-	 * @return

-	 *         always false

-	 */

-	@Override

-	public boolean canBeUsedAsColumnManager() {

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)

-	 *

-	 * @param elementId

-	 * @return

-	 */

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		return true;

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDestroyAxis(java.lang.Integer)

-	 *

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxis(Integer axisPosition) {

-		IAxis axis = (IAxis) getTableManager().getRowElementsList().get(axisPosition.intValue());// we need to have the tree list here and not the basic event list!

-		if (axis instanceof ITreeItemAxis) {

-			return ((ITreeItemAxis) axis).getParent() == null;

-		}

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)

-	 *

-	 * @param objectsToAdd

-	 * @return

-	 */

-	@Override

-	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {

-		// drop is allowed only when first level is not filled DnD

-		return FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(this.tableManager.getTable(), representedAxisManager, 0) == false && super.canDropAxisElement(objectsToAdd);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#compare(org.eclipse.nebula.widgets.nattable.sort.ISortModel, int, org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis,

-	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)

-	 *

-	 * @param sortModel

-	 * @param depth

-	 * @param axis1

-	 * @param axis2

-	 * @return

-	 * @see Comparator#compare(Object, Object)

-	 */

-	@Override

-	public int compare(ISortModel sortModel, int depth, ITreeItemAxis axis1, ITreeItemAxis axis2) {

-		if (axis1 == axis2) {

-			return 0;

-		}

-		if (axis1.getParent() != axis2.getParent()) {

-			Activator.log.warn("There is probably a bug, we are comparing 2 elements from differents level in the tree"); //$NON-NLS-1$

-			return 0;

-		}

-		Object el1 = axis1.getElement();

-		Object el2 = axis2.getElement();

-		int index1 = -2;

-		int index2 = -2;

-

-		// we are comparing 2 filling configurations

-		if (el1 instanceof TreeFillingConfiguration) {

-			Assert.isTrue(el2 instanceof TreeFillingConfiguration);

-			final List<TreeFillingConfiguration> confs = FillingConfigurationUtils.getTreeFillingConfiguration(getTable(), representedAxisManager);

-

-			index1 = confs.indexOf(el1);

-			index2 = confs.indexOf(el2);

-		} else {// we must compare values

-			// parent1 and parent2 are axis representing filling configuration

-			ITreeItemAxis parent1 = axis1.getParent();

-			if (parent1 == null) {

-				// its root element, filled by DnD

-				List<IAxis> axis = getRepresentedContentProvider().getAxis();

-				index1 = axis.indexOf(axis1);

-				index2 = axis.indexOf(axis2);

-			} else {

-				TreeFillingConfiguration conf = (TreeFillingConfiguration) parent1.getElement();

-				ITreeItemAxis grandFather1 = parent1.getParent();

-				Object context = null;

-				if (grandFather1 == null) {

-					context = getTableContext();

-				} else {

-					context = grandFather1.getElement();

-				}

-				Collection<?> values = getCellValueAsCollection(conf.getAxisUsedAsAxisProvider(), context);

-				if (values instanceof List<?>) {

-					index1 = ((List<?>) values).indexOf(axis1.getElement());

-					index2 = ((List<?>) values).indexOf(axis2.getElement());

-				}

-			}

-		}

-

-		int res = index1 - index2;

-		return Integer.signum(res);

-	}

-

-	/**

-	 *

-	 * @param parentAxis

-	 *            the parent axis

-	 * @param objectToAdd

-	 *            the object to add

-	 * @return

-	 *         the ITreeItemAxis created to represents this object

-	 */

-	protected abstract ITreeItemAxis createITreeItemAxis(ITreeItemAxis parentAxis, Object objectToAdd);

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		super.dispose();

-		this.managedElements.clear();

-		this.alreadyExpanded.clear();

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            update the list of the managed objects if its required

-	 */

-	protected void featureValueHasChanged(final Notification notification) {

-		// nothing to do

-	}

-

-	/**

-	 * This method add children representing TreeFillingConfiguration, only if there will be subelement to display for the TreeFillingConfiguration

-	 *

-	 * @param axis

-	 *            a axis representing a semantic element

-	 */

-	protected void fillChildrenForSemanticElement(final ITreeItemAxis axis) {

-		Assert.isTrue(axis == null || axis.getChildren().size() == 0);

-		int nextDepth = -1;

-		Object context;

-		if (axis == null) {

-			nextDepth = 0;

-			context = getTableContext();

-		} else {

-			nextDepth = getSemanticDepth(axis) + 1;

-			context = axis.getElement();

-			Assert.isTrue(!(context instanceof TreeFillingConfiguration));

-		}

-		final List<TreeFillingConfiguration> confs = FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth);

-		for (TreeFillingConfiguration current : confs) {

-			final Collection<?> values = getFilteredValueAsCollection(current, context, nextDepth);

-			if (values.size() != 0) {

-				ITreeItemAxis newAxis = addObject(axis, current);

-				if (nextDepth == 0) {

-					for (Object curr : values) {

-						addObject(newAxis, curr);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Fills the list with the children of the axis-> children are semantic elements

-	 *

-	 * @param axis

-	 *            an axis representing a tree filling configuration

-	 */

-	protected void fillChildrenForTreeFillingConfiguration(ITreeItemAxis axis) {

-		Object tmp = axis.getElement();

-		Assert.isTrue(tmp instanceof TreeFillingConfiguration);

-		TreeFillingConfiguration conf = (TreeFillingConfiguration) tmp;

-		ITreeItemAxis parent = axis.getParent();

-		int nextDepth = conf.getDepth();

-		Object context = null;

-		if (parent != null) {

-			context = parent.getElement();

-		} else {

-			context = getTableContext();

-		}

-		final Collection<?> values = getFilteredValueAsCollection(conf, context, nextDepth);

-		for (final Object value : values) {

-			addObject(axis, value);

-		}

-	}

-

-	/**

-	 *

-	 * @param element

-	 *            an element

-	 */

-	public void fillListWithGrandSon(final ITreeItemAxis element) {

-		Object context = element.getElement();

-		if (context instanceof TreeFillingConfiguration) {

-			for (ITreeItemAxis child : element.getChildren()) {

-				// child is a semantic element

-				fillChildrenForSemanticElement(child);

-			}

-			return;

-		}

-		for (ITreeItemAxis child : element.getChildren()) {

-			// child is a tree filling configuration

-			fillChildrenForTreeFillingConfiguration(child);

-		}

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#fillRoot()

-	 *

-	 */

-	@Override

-	public void fillListWithRoots() {

-		if (false == FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(tableManager.getTable(), representedAxisManager, 0)) {

-			for (IAxis current : getRepresentedContentProvider().getAxis()) {

-				if (current instanceof ITreeItemAxis) {

-					Assert.isTrue((current.getElement() instanceof TreeFillingConfiguration) == false);

-					ITreeItemAxisHelper.linkITreeItemAxisToSemanticElement(this.managedElements, (ITreeItemAxis) current);

-					fillChildrenForSemanticElement((ITreeItemAxis) current);

-				}

-			}

-			return;

-		}

-		fillChildrenForSemanticElement(null);

-	}

-

-	/**

-	 *

-	 * @param iaxis

-	 * @param rowElement

-	 *            the element

-	 * @return

-	 *         a collection of all values for the intersection of the iaxis and the row element. These values are not yet filtered by the method {@link #isAllowedContents(Object, Object, TreeFillingConfiguration, int)}

-	 */

-	protected final Collection<?> getCellValueAsCollection(final Object iaxis, final Object rowElement) {

-		Object value = CellManagerFactory.INSTANCE.getCrossValue(iaxis, rowElement, this.tableManager);

-		if (value == null) {

-			return Collections.emptyList();

-		}

-		if (value instanceof Collection<?>) {

-			return (Collection<?>) value;

-		}

-

-		if (value instanceof Object[]) {

-			return Arrays.asList(value);

-		}

-		return Collections.emptyList();

-	}

-

-	/**

-	 *

-	 * @param axis

-	 *            an object

-	 * @return

-	 *         the the

-	 */

-	protected int getDepth(final ITreeItemAxis axis) {

-		final INattableModelManager manager = getTableManager();

-		if (manager instanceof ITreeNattableModelManager) {

-			return ((ITreeNattableModelManager) manager).getTreeItemDepth(axis);

-		}

-		return 0;

-	}

-

-	/**

-	 *

-	 * @param conf

-	 *            axis used as row provider

-	 * @param rowElement

-	 *            row element

-	 * @param depth

-	 *            the depth of the new element

-	 * @return

-	 *         a collection with all values accepted as children of the rowElement. Returned values have been filtered by the method {@link #isAllowedContents(Object, Object, TreeFillingConfiguration, int)}

-	 */

-	protected final Collection<?> getFilteredValueAsCollection(final TreeFillingConfiguration conf, final Object rowElement, final int depth) {

-		Collection<?> values = getCellValueAsCollection(conf.getAxisUsedAsAxisProvider(), rowElement);

-		Collection<Object> returnedValues = new ArrayList<Object>();

-		Object parent = AxisUtils.getRepresentedElement(rowElement);

-		for (Object current : values) {

-			if (isAllowedContents(current, parent, conf, depth)) {

-				returnedValues.add(current);

-			}

-		}

-		return returnedValues;

-	}

-

-	/**

-	 *

-	 * @param axis

-	 *            an axis

-	 * @return

-	 *         the real depth of an element (semantic or {@link TreeFillingConfiguration}), that is to say than for {@link TreeFillingConfiguration} we return {@link TreeFillingConfiguration#getDepth()} and for a semantic element

-	 *         we returns the depth of the {@link TreeFillingConfiguration} parent of the {@link ITreeItemAxis} represented it.

-	 */

-	public final int getSemanticDepth(final ITreeItemAxis axis) {

-		final INattableModelManager manager = getTableManager();

-		if (manager instanceof ITreeNattableModelManager) {

-			return ((ITreeNattableModelManager) manager).getSemanticDepth(axis);

-		}

-		return 0;

-	}

-

-	protected Table getTable() {

-		return this.tableManager.getTable();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#initializeManagedObjectList()

-	 *

-	 */

-	@Override

-	protected void initializeManagedObjectList() {

-		// now it is not used

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)

-	 * @deprecated for ITreeItemAxisManagerForEventList, we must use isAllowedContents(Object, int depth)

-	 * @param object

-	 * @return

-	 */

-	@Override

-	@Deprecated

-	public boolean isAllowedContents(Object object) {

-		return super.isAllowedContents(object);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAlreadyManaged(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAlreadyManaged(Object object) {

-		if (this.managedElements.containsKey(object)) {

-			for (final ITreeItemAxis current : this.managedElements.get(object)) {

-				// an element can be displayed several time in the table, but only one as root

-				if (current.eContainer() != null) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isDynamic()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isDynamic() {

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isSlave() {

-		return false;

-	}

-

-	protected final void removeObject(final ITreeItemAxis axis) {

-		Collection<ITreeItemAxis> children = new ArrayList<ITreeItemAxis>(axis.getChildren());

-		for (ITreeItemAxis current : children) {

-			removeObject(current);

-			// EventListHelper.removeFromEventList(eventList, current);

-			// ITreeItemAxisHelper.unlinkITreeItemAxisToSemanticElement(this.managedElements, current);

-			// ITreeItemAxisHelper.destroyITreeItemAxis(getTableEditingDomain(), current);

-		}

-		final ITreeItemAxis parentAxis = axis.getParent();

-

-		EventListHelper.removeFromEventList(eventList, axis);

-		this.alreadyExpanded.remove(axis);

-		ITreeItemAxisHelper.unlinkITreeItemAxisToSemanticElement(this.managedElements, axis);

-		ITreeItemAxisHelper.destroyITreeItemAxis(getTableEditingDomain(), axis);

-		if (parentAxis != null) {

-			final Object representedElement = parentAxis.getElement();

-			if (representedElement instanceof TreeFillingConfiguration && parentAxis.getChildren().size() == 0) {

-				removeObject(parentAxis);

-			}

-		}

-	}

-

-	// /**

-	// *

-	// * @param axis

-	// * the axis to remove. Its children will be remove too. If its parent represents a TreeFillingConfiguration, without children, it will be removed too.

-	// */

-	// protected final void removeObject(final ITreeItemAxis axis) {

-	// Collection<ITreeItemAxis> children = new ArrayList<ITreeItemAxis>(axis.getChildren());

-	// for (ITreeItemAxis current : children) {

-	// //we must remove its children before to remove it!

-	// removeObject(current);

-	// }

-	//

-	//

-	// final ITreeItemAxis parentAxis = axis.getParent();

-	//

-	//

-	// this.alreadyExpanded.remove(axis);

-	// ITreeItemAxisHelper.unlinkITreeItemAxisToSemanticElement(this.managedElements, axis);

-	//

-	//

-	// //we unset its parent

-	// ITreeItemAxisHelper.destroyITreeItemAxis(getTableEditingDomain(), axis);

-	//

-	//

-	// //we remove it from the event list

-	// EventListHelper.removeFromEventList(eventList, axis);

-	//

-	// if (parentAxis != null) {

-	// final Object representedElement = parentAxis.getElement();

-	// if (representedElement instanceof TreeFillingConfiguration && parentAxis.getChildren().size() == 0) {

-	// removeObject(parentAxis);

-	// }

-	// }

-

-

-	// V1 of the remove object method

-	// Collection<ITreeItemAxis> children = new ArrayList<ITreeItemAxis>(axis.getChildren());

-	// for (ITreeItemAxis current : children) {

-	// removeObject(current);

-	// EventListHelper.removeFromEventList(eventList, current);

-	// ITreeItemAxisHelper.unlinkITreeItemAxisToSemanticElement(this.managedElements, current);

-	// ITreeItemAxisHelper.destroyITreeItemAxis(getTableEditingDomain(), current);

-	// }

-	// final ITreeItemAxis parentAxis = axis.getParent();

-	//

-	// EventListHelper.removeFromEventList(eventList, axis);

-	// this.alreadyExpanded.remove(axis);

-	// ITreeItemAxisHelper.unlinkITreeItemAxisToSemanticElement(this.managedElements, axis);

-	// ITreeItemAxisHelper.destroyITreeItemAxis(getTableEditingDomain(), axis);

-	// if (parentAxis != null) {

-	// final Object representedElement = parentAxis.getElement();

-	// if (representedElement instanceof TreeFillingConfiguration && parentAxis.getChildren().size() == 0) {

-	// removeObject(parentAxis);

-	// }

-	// }

-

-	// }

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#setExpanded(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis, java.util.List, boolean)

-	 *

-	 * @param element

-	 * @param path

-	 * @param expanded

-	 */

-	@Override

-	public void setExpanded(final ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded) {

-		if (!expanded) {

-			return;

-		}

-		if (!this.alreadyExpanded.contains(element)) {

-			fillListWithGrandSon(element);

-			this.alreadyExpanded.add(element);

-		}

-	}

-

-	/**

-	 * Update the list of the managed objects, ignoring ordered elements

-	 *

-	 * @param toAdd

-	 *            the list of the elements to add to the managed objects list

-	 * @param toRemove

-	 *            the list of the elements to remove to the managed objects list

-	 */

-	protected void updateManagedList(final List<Object> toAdd, final List<Object> toRemove) {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @param notification

-	 *            a notification

-	 * @return

-	 *         <code>true</code> if the notification must be ignored

-	 */

-	@Override

-	protected boolean ignoreEvent(final Notification notification) {

-		boolean res = super.ignoreEvent(notification);

-		if (res) {

-			return res;

-		}

-		Object feature = notification.getFeature();

-		if (feature instanceof EStructuralFeature) {

-			if (feature == NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis()) {

-				return false;

-			}

-			EObject parent = ((EStructuralFeature) feature).eContainer();

-			while (parent.eContainer() != null) {

-				parent = parent.eContainer();

-			}

-			return parent == NattablePackage.eINSTANCE;

-		}

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#fillListWithChildren(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)

-	 *

-	 * @param axis

-	 */

-	@Override

-	public void fillListWithChildren(final ITreeItemAxis parentAxis) {

-		Object element = parentAxis.getElement();

-		if (element instanceof TreeFillingConfiguration) {

-			fillChildrenForTreeFillingConfiguration(parentAxis);

-			return;

-		}

-		fillChildrenForSemanticElement(parentAxis);

-	}

-

-	/**

-	 *

-	 * @param notification

-	 */

-	@Override

-	protected void manageSetNotification(Notification notification) {

-		manageAddNotification(notification);

-		manageRemoveNotification(notification);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#manageUnsetNotification(org.eclipse.emf.common.notify.Notification)

-	 *

-	 * @param notification

-	 */

-	@Override

-	protected void manageUnsetNotification(Notification notification) {

-		manageRemoveNotification(notification);

-		manageAddNotification(notification);

-	}

-

-

-	/**

-	 *

-	 * @param toTest

-	 *            the value to test

-	 * @param conf

-	 *            a tree filling configuration

-	 * @param semanticParent

-	 *            the context to use to get values

-	 * @return

-	 *         <code>true</code> if the value can be displayed as a child of the {@link TreeFillingConfiguration}

-	 */

-	protected boolean isProvidedByTreeFillingConfiguration(final Object toTest, final TreeFillingConfiguration conf, final Object semanticParent) {

-		Collection<?> values = getFilteredValueAsCollection(conf, semanticParent, conf.getDepth());

-		return values.contains(toTest);

-	}

-

-	/**

-	 *

-	 * @param possibleRepresentation

-	 *            a list owning possible representation of an element

-	 * @param object

-	 *            the element

-	 * @return

-	 *         the {@link ITreeItemAxis} representing this element or <code>null</code> if not found

-	 */

-	public static final ITreeItemAxis getITreeItemAxisRepresentingObject(final Collection<ITreeItemAxis> possibleRepresentation, Object object) {

-		for (ITreeItemAxis axis : possibleRepresentation) {

-			if (axis.getElement() == object) {

-				return axis;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Adds the new axis to the list, and add its direct children

-	 *

-	 * @param axis

-	 *            the new axis to add to the list

-	 */

-	protected void manageAddITreeItemAxisForSemanticElement(final ITreeItemAxis axis) {

-		Assert.isTrue((axis.getElement() instanceof TreeFillingConfiguration) == false);

-		ITreeItemAxisHelper.linkITreeItemAxisToSemanticElement(this.managedElements, axis);

-		fillListWithChildren(axis);

-	}

-

-	/**

-	 * @param notification

-	 */

-	@Override

-	protected void manageAddNotification(Notification notification) {

-		Object notifier = notification.getNotifier();

-		Object newValue = notification.getNewValue();

-		Object feature = notification.getFeature();

-		// case 1 - the user added a new root axis by DnD

-		if (feature == NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis() && newValue instanceof ITreeItemAxis && ((ITreeItemAxis) newValue).getElement() instanceof EObject) {

-			manageAddITreeItemAxisForSemanticElement((ITreeItemAxis) newValue);

-			return;

-		}

-

-		// case 2 : the notifier is the context of the table and we have filling configuration for level 0

-		if (notifier == getTableContext() && FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {

-			for (final TreeFillingConfiguration current : FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, 0)) {

-				if (isProvidedByTreeFillingConfiguration(newValue, current, notifier)) {

-					Set<ITreeItemAxis> parentRepresentation = this.managedElements.get(current);

-					// we are on the root, so the set is null or its size is 1;

-					Assert.isTrue(parentRepresentation == null || parentRepresentation.size() == 1);

-					ITreeItemAxis parentConf = null;

-					if (parentRepresentation == null) {

-						parentConf = addObject(null, current);

-					} else {

-						parentConf = parentRepresentation.iterator().next();

-					}

-					addObject(parentConf, newValue);

-				}

-			}

-			return;

-		}

-

-		// case 3 - the notifier is a known element

-		if (this.managedElements.containsKey(notifier)) {

-			final Set<ITreeItemAxis> itemAxisRepresentations = this.managedElements.get(notifier);

-			// we need to add a child for each representation of its parent in the table

-			for (final ITreeItemAxis curr : itemAxisRepresentations) {

-

-				// we update the conf only when the parent of the representation has already been filled (so expanded)

-				if (curr.getParent() == null || this.alreadyExpanded.contains(curr.getParent())) {

-					// 1.1 : get the depth for the new value

-					int nextDepth = getSemanticDepth(curr) + 1;

-

-					// 1.2 verify than the new value is allowed

-					if (FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth)) {

-

-						// we cross the possible confs for this level

-						for (TreeFillingConfiguration conf : FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth)) {

-							if (isProvidedByTreeFillingConfiguration(newValue, conf, notifier)) {

-								// we must add the value

-								ITreeItemAxis confRep = getITreeItemAxisRepresentingObject(curr.getChildren(), conf);

-

-

-								if (confRep == null) {

-									confRep = addObject(curr, conf);

-								}

-								// if the representation of the notifier has already been expanded, we need to add the new value to the list, if not it will be done during the expand of the notifier

-								if (this.alreadyExpanded.contains(curr)) {

-									addObject(confRep, newValue);

-								}

-							}

-						}

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * @param notification

-	 */

-	@Override

-	protected void manageAddManyNotification(final Notification notification) {

-		final Object tmpValues = notification.getNewValue();

-		if (!(tmpValues instanceof Collection<?>)) {

-			return;

-		}

-

-		final Collection<?> values = (Collection<?>) tmpValues;

-		Object notifier = notification.getNotifier();

-		Object feature = notification.getFeature();

-

-		// case 1 - the user added a new roots axis by DnD

-		if (feature == NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis()) {

-			for (Object value : values) {

-				if (value instanceof ITreeItemAxis && !(((ITreeItemAxis) value).getElement() instanceof ITreeItemAxis)) {

-					manageAddITreeItemAxisForSemanticElement((ITreeItemAxis) value);

-				}

-			}

-			return;

-		}

-

-		// case 2 : the notifier is the context of the table and we have filling configuration for level 0

-		if (notifier == getTableContext() && FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {

-			for (final TreeFillingConfiguration current : FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, 0)) {

-

-				// all values to display for this conf

-				Collection<?> rows = getFilteredValueAsCollection(current, notifier, 0);

-				// all values to add

-				values.retainAll(rows);

-

-				if (values.size() > 0) {

-					Set<ITreeItemAxis> parentRepresentation = this.managedElements.get(current);

-					// we are on the root, so the set is null or its size is 1;

-					Assert.isTrue(parentRepresentation == null || parentRepresentation.size() == 1);

-					ITreeItemAxis confRep;

-					if (parentRepresentation == null) {

-						confRep = addObject(null, current);

-					} else {

-						confRep = parentRepresentation.iterator().next();

-					}

-					// only one representation

-					for (Object currVal : values) {

-						addObject(confRep, currVal);

-					}

-				}

-			}

-			return;

-		}

-

-		// case 3 - the notifier is a known element

-		if (!this.managedElements.containsKey(notifier)) {

-			return;

-		}

-		final Set<ITreeItemAxis> itemAxisRepresentations = this.managedElements.get(notifier);

-		// we need to add a child for each representation of its parent in the table

-		for (final ITreeItemAxis curr : itemAxisRepresentations) {

-

-			if (curr.getParent() == null || this.alreadyExpanded.contains(curr.getParent())) {

-				// 1.1 : get the depth for the new value

-				int nextDepth = getSemanticDepth(curr) + 1;

-				for (Object newValue : values) {

-					// 1.2 verify than the new value is allowed

-					if (FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth)) {

-

-						// we cross the possible confs for this level

-						for (TreeFillingConfiguration conf : FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth)) {

-							if (isProvidedByTreeFillingConfiguration(newValue, conf, notifier)) {

-								// we must add the value

-								ITreeItemAxis confRep = getITreeItemAxisRepresentingObject(curr.getChildren(), conf);

-								if (confRep == null) {

-									confRep = addObject(curr, conf);

-								}

-								// if the representation of the notifier has already been expanded, we need to add the new value to the list, if not it will be done during the expand of the notifier

-								if (this.alreadyExpanded.contains(curr)) {

-									addObject(confRep, newValue);

-								}

-							}

-						}

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * @param notification

-	 */

-	@Override

-	protected void manageMoveNotification(Notification notification) {

-		// no usecase found

-	}

-

-	protected void manageRemoveITreeItemAxisForSemanticElement(final ITreeItemAxis axis) {

-		Assert.isTrue((axis.getElement() instanceof TreeFillingConfiguration) == false);

-		removeObject(axis);

-	}

-

-	/**

-	 * @param notification

-	 */

-	@Override

-	protected void manageRemoveNotification(Notification notification) {

-		final Object oldValue = notification.getOldValue();

-

-		// a ITreeItemAxis is destroyed

-		if (oldValue instanceof ITreeItemAxis && !(((IAxis) oldValue).getElement() instanceof TreeFillingConfiguration)) {

-			removeObject((ITreeItemAxis) oldValue);

-			return;

-		}

-

-		manageRemoveSemanticElement(oldValue);

-	}

-

-	protected void manageRemoveSemanticElement(Object object) {

-		Assert.isTrue(false == (object instanceof ITreeItemAxis));

-		Assert.isTrue(false == (object instanceof TreeFillingConfiguration));

-		if (this.managedElements.containsKey(object)) {

-			Collection<ITreeItemAxis> itemAxisRepresentations = new ArrayList<ITreeItemAxis>(this.managedElements.get(object));

-			for (final ITreeItemAxis current : itemAxisRepresentations) {

-				ITreeItemAxis parent = current.getParent();

-				// must always be a TreeFillingConfiguration

-				TreeFillingConfiguration conf = (TreeFillingConfiguration) parent.getElement();

-				Object context;

-				ITreeItemAxis greatParent = parent.getParent();

-				if (greatParent == null) {

-					context = getTableContext();

-				} else {

-					context = greatParent.getElement();

-				}

-				Collection<?> values = getCellValueAsCollection(conf.getAxisUsedAsAxisProvider(), context);

-				if (!values.contains(object)) {

-					removeObject(current);

-				}

-			}

-		}

-	}

-

-

-	/**

-	 * @param notification

-	 */

-	@Override

-	protected void manageRemoveManyNotification(Notification notification) {

-		final Object tmpOldValues = notification.getOldValue();

-		if (!(tmpOldValues instanceof Collection<?>)) {

-			return;

-		}

-

-		Collection<?> oldValues = (Collection<?>) tmpOldValues;

-		Object feature = notification.getFeature();

-

-		// case 1 - a root IAxis has been destroyed by the user

-		if (feature == NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis()) {

-			for (Object value : oldValues) {

-				if (value instanceof ITreeItemAxis && !(((ITreeItemAxis) value).getElement() instanceof ITreeItemAxis)) {

-					manageRemoveITreeItemAxisForSemanticElement((ITreeItemAxis) value);

-				}

-			}

-			return;

-		}

-

-		// case 2 - a semantic element has been removed

-		for (Object val : oldValues) {

-			manageRemoveSemanticElement(val);

-		}

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)

-	 *

-	 * @param axisIndex

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxisElement(Integer axisIndex) {

-		return false;

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Integer)

-	 *

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {

-		return null;

-	}

-

-	/**

-	 * Update the children of semanticElementRepresentation OR the roots of the table if the parameter is <code>null</code>

-	 *

-	 * Not really tested and not yet used in an offical Papyrus table

-	 *

-	 * @param semanticElementRepresentation

-	 *            a {@link ITreeItemAxis} for which we want update the children, could be <code>null</code>, in this case we will update the root elements of the table

-	 */

-	protected void updateChildren(final ITreeItemAxis semanticElementRepresentation) {

-		Assert.isTrue(semanticElementRepresentation == null || !(semanticElementRepresentation.getElement() instanceof TreeFillingConfiguration));

-		ITreeItemAxis current = semanticElementRepresentation;

-		if (current == null || (current.getParent() != null && this.alreadyExpanded.contains(current.getParent()))) {

-			int nextDepth;

-			Object context;

-			if (semanticElementRepresentation == null) {

-				nextDepth = 0;

-				context = getTableContext();

-			} else {

-				nextDepth = getSemanticDepth(semanticElementRepresentation) + 1;

-				context = semanticElementRepresentation.getElement();

-			}

-

-			List<TreeFillingConfiguration> confs = FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth);

-			for (TreeFillingConfiguration conf : confs) {

-				ITreeItemAxis confRep = null;

-				if (current != null) {

-					confRep = getITreeItemAxisRepresentingObject(current.getChildren(), conf);

-				} else if (nextDepth == 0) {

-					if (managedElements.containsKey(conf)) {

-						// we are on the root of the table, so the configuration can be represented only one time in the map

-						confRep = managedElements.get(conf).iterator().next();

-					}

-				}

-

-				final Collection<?> values = getFilteredValueAsCollection(conf, context, nextDepth);

-				List<Object> knownElements = new ArrayList<Object>();

-				List<ITreeItemAxis> toRemove = new ArrayList<ITreeItemAxis>();

-				if (confRep != null) {

-					List<ITreeItemAxis> children = new ArrayList<ITreeItemAxis>(confRep.getChildren());

-					for (ITreeItemAxis child : children) {

-						Object tmp = child.getElement();

-						if (!values.contains(tmp)) {

-							toRemove.add(child); // we can't remove them now, because confRep could be destroy here, and maybe we need it after

-						}

-						knownElements.add(child.getElement());

-					}

-					values.removeAll(knownElements);

-					if (alreadyExpanded.contains(current)) {

-						for (Object val : values) {

-							addObject(confRep, val);

-						}

-					}

-

-					for (ITreeItemAxis axis : toRemove) {

-						removeObject(axis);

-					}

-				} else if (false == values.isEmpty()) {

-					confRep = addObject(current, conf);

-					if (alreadyExpanded.contains(current) || current == null) {// current==null for root

-						for (Object val : values) {

-							addObject(confRep, val);

-						}

-					}

-				}

-			}

-		}

-	}

-

-

-	/**

-	 * This method updates the contents of the table

-	 *

-	 * @param semanticElement

-	 *            the semantic element for which we want to update the visibility

-	 */

-	protected void updateSemanticElement(final Object semanticElement) {

-		if (FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), representedAxisManager, 0)) {

-			// we update all the roots of the table : the element could be now visible or hidden

-			updateChildren(null);

-		}

-

-		if (this.managedElements.containsKey(semanticElement)) {

-			for (ITreeItemAxis sementicItemRep : this.managedElements.get(semanticElement)) {

-				updateChildren(sementicItemRep);

-			}

-		}

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#managedHideShowCategoriesForDepth(java.util.List, java.util.List)

-	 *

-	 * @param depthToHide

-	 * @param depthToShow

-	 */

-	@Override

-	public void managedHideShowCategoriesForDepth(List<Integer> depthToHide, List<Integer> depthToShow) {

-		hideCategories(depthToHide);

-		showCategoriesForDepth(depthToShow);

-	}

-

-	/**

-	 *

-	 * @param depthToHide

-	 *            the list of the depth for which we want to hide the categories

-	 */

-	protected void hideCategories(final List<Integer> depthToHide) {

-		if (depthToHide == null || depthToHide.isEmpty()) {

-			return;

-		}

-		RowHideShowLayer rowHideLayer = getRowHideShowLayer();

-		if (rowHideLayer == null) {

-			return;

-		}

-		NatTable natTable = (NatTable) getTableManager().getAdapter(NatTable.class);

-		if (natTable == null) {

-			return;

-		}

-		if (depthToHide != null && depthToHide.size() > 0) {

-			Set<Integer> indexesToHide = new TreeSet<Integer>();

-			for (Integer curr : depthToHide) {

-				List<TreeFillingConfiguration> fillingConf = FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, curr);

-				for (TreeFillingConfiguration treeFillingConfiguration : fillingConf) {

-					if (this.managedElements.containsKey(treeFillingConfiguration)) {

-						for (ITreeItemAxis axis : this.managedElements.get(treeFillingConfiguration)) {

-							int index = getTableManager().getRowElementsList().indexOf(axis);

-							ITreeItemAxis parentAxis = axis.getParent();

-							if (parentAxis != null && parentAxis.isExpanded() && !axis.isExpanded()) {

-								getTreeLayer().expandTreeRow(index);

-								index = getTableManager().getRowElementsList().indexOf(axis);

-							} else if (parentAxis == null) {

-								getTreeLayer().expandTreeRow(index);

-								index = getTableManager().getRowElementsList().indexOf(axis);

-							}

-

-							if (index != -1) {// -1 when not yet visible

-								int convertedIndex = rowHideLayer.underlyingToLocalRowPosition(natTable, index);

-								indexesToHide.add(convertedIndex);

-							}

-						}

-					}

-				}

-			}

-

-			if (indexesToHide.size() > 0) {

-				int[] ar = new int[indexesToHide.size()];

-				Iterator<Integer> iter = indexesToHide.iterator();

-				int i = 0;

-				while (iter.hasNext()) {

-					ar[i] = iter.next();

-					i++;

-				}

-				natTable.doCommand(new MultiRowHideCommand(rowHideLayer, ar));

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @param depthToHide

-	 *            the list of the depth for which we want to hide the categories

-	 */

-	protected void showCategoriesForDepth(final List<Integer> depthToShow) {

-		if (depthToShow == null || depthToShow.isEmpty()) {

-			return;

-		}

-		NatTable natTable = (NatTable) getTableManager().getAdapter(NatTable.class);

-		if (natTable == null) {

-			return;

-		}

-		List<Integer> indexesToShow = new ArrayList<Integer>();

-		for (Integer curr : depthToShow) {

-			List<TreeFillingConfiguration> fillingConf = FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, curr);

-			for (TreeFillingConfiguration treeFillingConfiguration : fillingConf) {

-				if (this.managedElements.containsKey(treeFillingConfiguration)) {

-					for (ITreeItemAxis axis : this.managedElements.get(treeFillingConfiguration)) {

-						indexesToShow.add(getTableManager().getRowElementsList().indexOf(axis));

-					}

-				}

-			}

-		}

-		if (indexesToShow.size() > 0) {

-			natTable.doCommand(new MultiRowShowCommand(indexesToShow));

-		}

-	}

-

-	/**

-	 *

-	 * @return

-	 *         the row hide show layer

-	 */

-	protected final RowHideShowLayer getRowHideShowLayer() {

-		if (this.tableManager != null && this.tableManager.getBodyLayerStack() != null) {

-			return this.tableManager.getBodyLayerStack().getRowHideShowLayer();

-		}

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#fillingConfigurationsHaveChanged()

-	 *

-	 */

-	@Override

-	public void fillingConfigurationsHaveChanged() {

-		List<TreeFillingConfiguration> oldFillingConfiguration = this.currentFillingConfiguration;

-		List<TreeFillingConfiguration> newFillingConf = FillingConfigurationUtils.getTreeFillingConfiguration(getTable(), this.representedAxisManager);

-		this.currentFillingConfiguration = newFillingConf;

-		if (oldFillingConfiguration.equals(newFillingConf)) {

-			return;

-		}

-

-

-		// 1. we remove all filling configuration which have been deleted

-		List<TreeFillingConfiguration> confToRemove = new ArrayList<TreeFillingConfiguration>(oldFillingConfiguration);

-		confToRemove.removeAll(newFillingConf);

-		for (TreeFillingConfiguration current : confToRemove) {

-			if (managedElements.containsKey(current)) {

-				Set<ITreeItemAxis> axisRepresentation = new HashSet<ITreeItemAxis>(managedElements.get(current));

-				for (ITreeItemAxis tmp : axisRepresentation) {

-					removeObject(tmp);

-				}

-			}

-		}

-

-		List<TreeFillingConfiguration> confToAdd = new ArrayList<TreeFillingConfiguration>(newFillingConf);

-		confToAdd.removeAll(oldFillingConfiguration);

-		if (confToAdd.isEmpty()) {

-			return;

-		}

-		for (TreeFillingConfiguration treeFillingConfiguration : confToAdd) {

-			int depth = treeFillingConfiguration.getDepth();

-			if (depth == 0) {

-				updateChildren(null);

-			} else {

-				for (TreeFillingConfiguration previousConfig : FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, depth - 1)) {

-					if (this.managedElements.containsKey(previousConfig)) {

-						for (ITreeItemAxis axis : this.managedElements.get(previousConfig)) {

-							for (ITreeItemAxis child : axis.getChildren()) {

-								updateSemanticElement(child.getElement());

-							}

-						}

-					}

-				}

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * 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:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.manager.axis;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.hideshow.RowHideShowLayer;
+import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiRowHideCommand;
+import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiRowShowCommand;
+import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.sort.ISortModel;
+import org.eclipse.nebula.widgets.nattable.tree.TreeLayer;
+import org.eclipse.papyrus.commands.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
+import org.eclipse.papyrus.infra.nattable.layer.PapyrusGridLayer;
+import org.eclipse.papyrus.infra.nattable.layerstack.RowHeaderHierarchicalLayerStack;
+import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;
+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.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+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.tree.ITreeItemAxisHelper;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.EventListHelper;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+
+
+/**
+ * @author VL222926
+ *
+ */
+public abstract class AbstractTreeAxisManagerForEventList extends AbstractAxisManagerForEventList implements ITreeItemAxisManagerForEventList {
+
+	/**
+	 * a map with the elements managed by this axis manager : keys are semantic elements and values a set of the representation of these elements in the table
+	 */
+	protected Map<Object, Set<ITreeItemAxis>> managedElements = new HashMap<Object, Set<ITreeItemAxis>>();
+
+	/**
+	 * the list of axis which have been expanded one time
+	 */
+	protected List<ITreeItemAxis> alreadyExpanded = new ArrayList<ITreeItemAxis>();
+
+	/**
+	 * the current filling configuration used by this axis manager
+	 */
+	protected List<TreeFillingConfiguration> currentFillingConfiguration;
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#init(org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager, org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation,
+	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider)
+	 *
+	 * @param manager
+	 * @param rep
+	 * @param provider
+	 */
+	@Override
+	public void init(INattableModelManager manager, AxisManagerRepresentation rep, AbstractAxisProvider provider) {
+		super.init(manager, rep, provider);
+		this.currentFillingConfiguration = FillingConfigurationUtils.getTreeFillingConfiguration(getTable(), representedAxisManager);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#addListeners()
+	 *
+	 */
+	@Override
+	protected void addListeners() {
+		// nothing to do here
+	}
+
+	/**
+	 *
+	 * @param parentAxis
+	 *            the parent axis
+	 * @param objectToAdd
+	 *            the object to add as child of the parent axis
+	 * @return
+	 *         the created {@link ITreeItemAxis} representing objectToAdd
+	 */
+	protected final ITreeItemAxis addObject(final ITreeItemAxis parentAxis, final Object objectToAdd) {
+		final ITreeItemAxis newAxis = createITreeItemAxis(parentAxis, objectToAdd);
+		if (objectToAdd instanceof TreeFillingConfiguration) {
+			TreeFillingConfiguration conf = (TreeFillingConfiguration) objectToAdd;
+			if (this.alreadyExpanded.contains(parentAxis)) {
+				// if the representation of the notifier has already been expanded, we need to add the new value to the list, if not it will be done during the expand of the notifier
+				// we must to expand tree filling configuration when its is hidden and its parent is expanded
+				if (StyleUtils.isHiddenDepth(getTableManager(), conf.getDepth())) {
+
+
+					try {
+						if(null != getTableEditingDomain()){
+							GMFUnsafe.write(getTableEditingDomain(), new Runnable() {
+	
+								@Override
+								public void run() {
+									newAxis.setExpanded(true);
+								}
+							});
+						}else{
+							newAxis.setExpanded(true);
+						}
+					} catch (InterruptedException e) {
+						Activator.log.error(e);
+					} catch (RollbackException e) {
+						Activator.log.error(e);
+					}
+					this.alreadyExpanded.add(newAxis);
+				}
+			}
+		}
+		ITreeItemAxisHelper.linkITreeItemAxisToSemanticElement(this.managedElements, newAxis);
+		EventListHelper.addToEventList(this.eventList, newAxis);
+
+		return newAxis;
+	}
+
+
+	/**
+	 * TODO : find a better way to get the tree layer
+	 *
+	 * @return
+	 *         the tree layer
+	 */
+	private TreeLayer getTreeLayer() {
+		NatTable natTable = (NatTable) getTableManager().getAdapter(NatTable.class);
+		ILayer layer = natTable.getLayer();
+		if (layer instanceof PapyrusGridLayer) {
+			PapyrusGridLayer gridLayer = (PapyrusGridLayer) layer;
+			ILayer rowLayer = gridLayer.getRowHeaderLayer();
+			if (rowLayer instanceof RowHeaderHierarchicalLayerStack) {
+				return ((RowHeaderHierarchicalLayerStack) rowLayer).getTreeLayer();
+			}
+		}
+		throw new UnknownError("TreeLayer has not been found"); //$NON-NLS-1$
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsColumnManager()
+	 *
+	 * @return
+	 *         always false
+	 */
+	@Override
+	public boolean canBeUsedAsColumnManager() {
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)
+	 *
+	 * @param elementId
+	 * @return
+	 */
+	@Override
+	public boolean canCreateAxisElement(String elementId) {
+		return true;
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDestroyAxis(java.lang.Integer)
+	 *
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public boolean canDestroyAxis(Integer axisPosition) {
+		IAxis axis = (IAxis) getTableManager().getRowElementsList().get(axisPosition.intValue());// we need to have the tree list here and not the basic event list!
+		if (axis instanceof ITreeItemAxis) {
+			return ((ITreeItemAxis) axis).getParent() == null;
+		}
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)
+	 *
+	 * @param objectsToAdd
+	 * @return
+	 */
+	@Override
+	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {
+		// drop is allowed only when first level is not filled DnD
+		return FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(this.tableManager.getTable(), representedAxisManager, 0) == false && super.canDropAxisElement(objectsToAdd);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#compare(org.eclipse.nebula.widgets.nattable.sort.ISortModel, int, org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis,
+	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
+	 *
+	 * @param sortModel
+	 * @param depth
+	 * @param axis1
+	 * @param axis2
+	 * @return
+	 * @see Comparator#compare(Object, Object)
+	 */
+	@Override
+	public int compare(ISortModel sortModel, int depth, ITreeItemAxis axis1, ITreeItemAxis axis2) {
+		if (axis1 == axis2) {
+			return 0;
+		}
+		if (axis1.getParent() != axis2.getParent()) {
+			Activator.log.warn("There is probably a bug, we are comparing 2 elements from differents level in the tree"); //$NON-NLS-1$
+			return 0;
+		}
+		Object el1 = axis1.getElement();
+		Object el2 = axis2.getElement();
+		int index1 = -2;
+		int index2 = -2;
+
+		// we are comparing 2 filling configurations
+		if (el1 instanceof TreeFillingConfiguration) {
+			Assert.isTrue(el2 instanceof TreeFillingConfiguration);
+			final List<TreeFillingConfiguration> confs = FillingConfigurationUtils.getTreeFillingConfiguration(getTable(), representedAxisManager);
+
+			index1 = confs.indexOf(el1);
+			index2 = confs.indexOf(el2);
+		} else {// we must compare values
+			// parent1 and parent2 are axis representing filling configuration
+			ITreeItemAxis parent1 = axis1.getParent();
+			if (parent1 == null) {
+				// its root element, filled by DnD
+				List<IAxis> axis = getRepresentedContentProvider().getAxis();
+				index1 = axis.indexOf(axis1);
+				index2 = axis.indexOf(axis2);
+			} else {
+				TreeFillingConfiguration conf = (TreeFillingConfiguration) parent1.getElement();
+				ITreeItemAxis grandFather1 = parent1.getParent();
+				Object context = null;
+				if (grandFather1 == null) {
+					context = getTableContext();
+				} else {
+					context = grandFather1.getElement();
+				}
+				Collection<?> values = getCellValueAsCollection(conf.getAxisUsedAsAxisProvider(), context);
+				if (values instanceof List<?>) {
+					index1 = ((List<?>) values).indexOf(axis1.getElement());
+					index2 = ((List<?>) values).indexOf(axis2.getElement());
+				}
+			}
+		}
+
+		int res = index1 - index2;
+		return Integer.signum(res);
+	}
+
+	/**
+	 *
+	 * @param parentAxis
+	 *            the parent axis
+	 * @param objectToAdd
+	 *            the object to add
+	 * @return
+	 *         the ITreeItemAxis created to represents this object
+	 */
+	protected abstract ITreeItemAxis createITreeItemAxis(ITreeItemAxis parentAxis, Object objectToAdd);
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		super.dispose();
+		this.managedElements.clear();
+		this.alreadyExpanded.clear();
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            update the list of the managed objects if its required
+	 */
+	protected void featureValueHasChanged(final Notification notification) {
+		// nothing to do
+	}
+
+	/**
+	 * This method add children representing TreeFillingConfiguration, only if there will be subelement to display for the TreeFillingConfiguration
+	 *
+	 * @param axis
+	 *            a axis representing a semantic element
+	 */
+	protected void fillChildrenForSemanticElement(final ITreeItemAxis axis) {
+		Assert.isTrue(axis == null || axis.getChildren().size() == 0);
+		int nextDepth = -1;
+		Object context;
+		if (axis == null) {
+			nextDepth = 0;
+			context = getTableContext();
+		} else {
+			nextDepth = getSemanticDepth(axis) + 1;
+			context = axis.getElement();
+			Assert.isTrue(!(context instanceof TreeFillingConfiguration));
+		}
+		final List<TreeFillingConfiguration> confs = FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth);
+		for (TreeFillingConfiguration current : confs) {
+			final Collection<?> values = getFilteredValueAsCollection(current, context, nextDepth);
+			if (values.size() != 0) {
+				ITreeItemAxis newAxis = addObject(axis, current);
+				if (nextDepth == 0) {
+					for (Object curr : values) {
+						addObject(newAxis, curr);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Fills the list with the children of the axis-> children are semantic elements
+	 *
+	 * @param axis
+	 *            an axis representing a tree filling configuration
+	 */
+	protected void fillChildrenForTreeFillingConfiguration(ITreeItemAxis axis) {
+		Object tmp = axis.getElement();
+		Assert.isTrue(tmp instanceof TreeFillingConfiguration);
+		TreeFillingConfiguration conf = (TreeFillingConfiguration) tmp;
+		ITreeItemAxis parent = axis.getParent();
+		int nextDepth = conf.getDepth();
+		Object context = null;
+		if (parent != null) {
+			context = parent.getElement();
+		} else {
+			context = getTableContext();
+		}
+		final Collection<?> values = getFilteredValueAsCollection(conf, context, nextDepth);
+		for (final Object value : values) {
+			addObject(axis, value);
+		}
+	}
+
+	/**
+	 *
+	 * @param element
+	 *            an element
+	 */
+	public void fillListWithGrandSon(final ITreeItemAxis element) {
+		Object context = element.getElement();
+		if (context instanceof TreeFillingConfiguration) {
+			for (ITreeItemAxis child : element.getChildren()) {
+				// child is a semantic element
+				fillChildrenForSemanticElement(child);
+			}
+			return;
+		}
+		for (ITreeItemAxis child : element.getChildren()) {
+			// child is a tree filling configuration
+			fillChildrenForTreeFillingConfiguration(child);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#fillRoot()
+	 *
+	 */
+	@Override
+	public void fillListWithRoots() {
+		if (false == FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(tableManager.getTable(), representedAxisManager, 0)) {
+			for (IAxis current : getRepresentedContentProvider().getAxis()) {
+				if (current instanceof ITreeItemAxis) {
+					Assert.isTrue((current.getElement() instanceof TreeFillingConfiguration) == false);
+					ITreeItemAxisHelper.linkITreeItemAxisToSemanticElement(this.managedElements, (ITreeItemAxis) current);
+					fillChildrenForSemanticElement((ITreeItemAxis) current);
+				}
+			}
+			return;
+		}
+		fillChildrenForSemanticElement(null);
+	}
+
+	/**
+	 *
+	 * @param iaxis
+	 * @param rowElement
+	 *            the element
+	 * @return
+	 * 		a collection of all values for the intersection of the iaxis and the row element. These values are not yet filtered by the method {@link #isAllowedContents(Object, Object, TreeFillingConfiguration, int)}
+	 */
+	protected final Collection<?> getCellValueAsCollection(final Object iaxis, final Object rowElement) {
+		Object value = CellManagerFactory.INSTANCE.getCrossValue(iaxis, rowElement, this.tableManager);
+		Collection<?> collection = Collections.emptyList();
+
+		if (value instanceof Collection<?>) {
+			collection = (Collection<?>) value;
+		} else if (value instanceof Object[]) {
+			collection = Arrays.asList(value);
+		} else if (value != null) {
+			collection = Collections.singletonList(value);
+		}
+
+		return collection;
+	}
+
+	/**
+	 *
+	 * @param axis
+	 *            an object
+	 * @return
+	 *         the depth of the axis
+	 */
+	protected int getDepth(final ITreeItemAxis axis) {
+		final INattableModelManager manager = getTableManager();
+		if (manager instanceof ITreeNattableModelManager) {
+			return ((ITreeNattableModelManager) manager).getTreeItemDepth(axis);
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @param conf
+	 *            axis used as row provider
+	 * @param rowElement
+	 *            row element
+	 * @param depth
+	 *            the depth of the new element
+	 * @return
+	 *         a collection with all values accepted as children of the rowElement. Returned values have been filtered by the method {@link #isAllowedContents(Object, Object, TreeFillingConfiguration, int)}
+	 */
+	protected final Collection<?> getFilteredValueAsCollection(final TreeFillingConfiguration conf, final Object rowElement, final int depth) {
+		Collection<?> values = getCellValueAsCollection(conf.getAxisUsedAsAxisProvider(), rowElement);
+		Collection<Object> returnedValues = new ArrayList<Object>();
+		Object parent = AxisUtils.getRepresentedElement(rowElement);
+		for (Object current : values) {
+			if (isAllowedContents(current, parent, conf, depth)) {
+				returnedValues.add(current);
+			}
+		}
+		return returnedValues;
+	}
+
+	/**
+	 *
+	 * @param axis
+	 *            an axis
+	 * @return
+	 *         the real depth of an element (semantic or {@link TreeFillingConfiguration}), that is to say than for {@link TreeFillingConfiguration} we return {@link TreeFillingConfiguration#getDepth()} and for a semantic element
+	 *         we returns the depth of the {@link TreeFillingConfiguration} parent of the {@link ITreeItemAxis} represented it.
+	 */
+	public final int getSemanticDepth(final ITreeItemAxis axis) {
+		final INattableModelManager manager = getTableManager();
+		if (manager instanceof ITreeNattableModelManager) {
+			return ((ITreeNattableModelManager) manager).getSemanticDepth(axis);
+		}
+		return 0;
+	}
+
+	protected Table getTable() {
+		return this.tableManager.getTable();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#initializeManagedObjectList()
+	 *
+	 */
+	@Override
+	protected void initializeManagedObjectList() {
+		// now it is not used
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)
+	 * @deprecated for ITreeItemAxisManagerForEventList, we must use isAllowedContents(Object, int depth)
+	 * @param object
+	 * @return
+	 */
+	@Override
+	@Deprecated
+	public boolean isAllowedContents(Object object) {
+		return super.isAllowedContents(object);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAlreadyManaged(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public boolean isAlreadyManaged(Object object) {
+		if (this.managedElements.containsKey(object)) {
+			for (final ITreeItemAxis current : this.managedElements.get(object)) {
+				// an element can be displayed several time in the table, but only one as root
+				if (current.eContainer() != null) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isDynamic()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isDynamic() {
+		return true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isSlave() {
+		return false;
+	}
+
+	protected final void removeObject(final ITreeItemAxis axis) {
+		Collection<ITreeItemAxis> children = new ArrayList<ITreeItemAxis>(axis.getChildren());
+		for (ITreeItemAxis current : children) {
+			removeObject(current);
+			// EventListHelper.removeFromEventList(eventList, current);
+			// ITreeItemAxisHelper.unlinkITreeItemAxisToSemanticElement(this.managedElements, current);
+			// ITreeItemAxisHelper.destroyITreeItemAxis(getTableEditingDomain(), current);
+		}
+		final ITreeItemAxis parentAxis = axis.getParent();
+
+		EventListHelper.removeFromEventList(eventList, axis);
+		this.alreadyExpanded.remove(axis);
+		ITreeItemAxisHelper.unlinkITreeItemAxisToSemanticElement(this.managedElements, axis);
+		ITreeItemAxisHelper.destroyITreeItemAxis(getTableEditingDomain(), axis);
+		if (parentAxis != null) {
+			final Object representedElement = parentAxis.getElement();
+			if (representedElement instanceof TreeFillingConfiguration && parentAxis.getChildren().size() == 0) {
+				removeObject(parentAxis);
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#setExpanded(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis, java.util.List, boolean)
+	 *
+	 * @param element
+	 * @param path
+	 * @param expanded
+	 */
+	@Override
+	public void setExpanded(final ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded) {
+		if (!expanded) {
+			return;
+		}
+		if (!this.alreadyExpanded.contains(element)) {
+			fillListWithGrandSon(element);
+			this.alreadyExpanded.add(element);
+		}
+	}
+
+	/**
+	 * Update the list of the managed objects, ignoring ordered elements
+	 *
+	 * @param toAdd
+	 *            the list of the elements to add to the managed objects list
+	 * @param toRemove
+	 *            the list of the elements to remove to the managed objects list
+	 */
+	protected void updateManagedList(final List<Object> toAdd, final List<Object> toRemove) {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @param notification
+	 *            a notification
+	 * @return
+	 *         <code>true</code> if the notification must be ignored
+	 */
+	@Override
+	protected boolean ignoreEvent(final Notification notification) {
+		boolean res = super.ignoreEvent(notification);
+		if (res) {
+			return res;
+		}
+		Object feature = notification.getFeature();
+		if (feature instanceof EStructuralFeature) {
+			if (feature == NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis()) {
+				return false;
+			}
+			EObject parent = ((EStructuralFeature) feature).eContainer();
+			while (parent.eContainer() != null) {
+				parent = parent.eContainer();
+			}
+			return parent == NattablePackage.eINSTANCE;
+		}
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#fillListWithChildren(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
+	 *
+	 * @param axis
+	 */
+	@Override
+	public void fillListWithChildren(final ITreeItemAxis parentAxis) {
+		Object element = parentAxis.getElement();
+		if (element instanceof TreeFillingConfiguration) {
+			fillChildrenForTreeFillingConfiguration(parentAxis);
+			return;
+		}
+		fillChildrenForSemanticElement(parentAxis);
+	}
+
+	/**
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void manageSetNotification(Notification notification) {
+		manageAddNotification(notification);
+		manageRemoveNotification(notification);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#manageUnsetNotification(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void manageUnsetNotification(Notification notification) {
+		manageRemoveNotification(notification);
+		manageAddNotification(notification);
+	}
+
+
+	/**
+	 *
+	 * @param toTest
+	 *            the value to test
+	 * @param conf
+	 *            a tree filling configuration
+	 * @param semanticParent
+	 *            the context to use to get values
+	 * @return
+	 *         <code>true</code> if the value can be displayed as a child of the {@link TreeFillingConfiguration}
+	 */
+	protected boolean isProvidedByTreeFillingConfiguration(final Object toTest, final TreeFillingConfiguration conf, final Object semanticParent) {
+		Collection<?> values = getFilteredValueAsCollection(conf, semanticParent, conf.getDepth());
+		return values.contains(toTest);
+	}
+
+	/**
+	 *
+	 * @param possibleRepresentation
+	 *            a list owning possible representation of an element
+	 * @param object
+	 *            the element
+	 * @return
+	 *         the {@link ITreeItemAxis} representing this element or <code>null</code> if not found
+	 */
+	public static final ITreeItemAxis getITreeItemAxisRepresentingObject(final Collection<ITreeItemAxis> possibleRepresentation, Object object) {
+		for (ITreeItemAxis axis : possibleRepresentation) {
+			if (axis.getElement() == object) {
+				return axis;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Adds the new axis to the list, and add its direct children
+	 *
+	 * @param axis
+	 *            the new axis to add to the list
+	 */
+	protected void manageAddITreeItemAxisForSemanticElement(final ITreeItemAxis axis) {
+		Assert.isTrue((axis.getElement() instanceof TreeFillingConfiguration) == false);
+		ITreeItemAxisHelper.linkITreeItemAxisToSemanticElement(this.managedElements, axis);
+		fillListWithChildren(axis);
+	}
+
+	/**
+	 * @param notification
+	 */
+	@Override
+	protected void manageAddNotification(Notification notification) {
+		Object notifier = notification.getNotifier();
+		Object newValue = notification.getNewValue();
+		Object feature = notification.getFeature();
+		// case 1 - the user added a new root axis by DnD
+		if (feature == NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis() && newValue instanceof ITreeItemAxis && ((ITreeItemAxis) newValue).getElement() instanceof EObject) {
+			manageAddITreeItemAxisForSemanticElement((ITreeItemAxis) newValue);
+			return;
+		}
+
+		// case 2 : the notifier is the context of the table and we have filling configuration for level 0
+		if (notifier == getTableContext() && FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {
+			for (final TreeFillingConfiguration current : FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, 0)) {
+				if (isProvidedByTreeFillingConfiguration(newValue, current, notifier)) {
+					Set<ITreeItemAxis> parentRepresentation = this.managedElements.get(current);
+					// we are on the root, so the set is null or its size is 1;
+					Assert.isTrue(parentRepresentation == null || parentRepresentation.size() == 1);
+					ITreeItemAxis parentConf = null;
+					if (parentRepresentation == null) {
+						parentConf = addObject(null, current);
+					} else {
+						parentConf = parentRepresentation.iterator().next();
+					}
+					addObject(parentConf, newValue);
+				}
+			}
+			return;
+		}
+
+		// case 3 - the notifier is a known element
+		if (this.managedElements.containsKey(notifier)) {
+			final Set<ITreeItemAxis> itemAxisRepresentations = this.managedElements.get(notifier);
+			// we need to add a child for each representation of its parent in the table
+			for (final ITreeItemAxis curr : itemAxisRepresentations) {
+
+				// we update the conf only when the parent of the representation has already been filled (so expanded)
+				if (curr.getParent() == null || this.alreadyExpanded.contains(curr.getParent())) {
+					// 1.1 : get the depth for the new value
+					int nextDepth = getSemanticDepth(curr) + 1;
+
+					// 1.2 verify than the new value is allowed
+					if (FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth)) {
+
+						// we cross the possible confs for this level
+						for (TreeFillingConfiguration conf : FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth)) {
+							if (isProvidedByTreeFillingConfiguration(newValue, conf, notifier)) {
+								// we must add the value
+								ITreeItemAxis confRep = getITreeItemAxisRepresentingObject(curr.getChildren(), conf);
+
+
+								if (confRep == null) {
+									confRep = addObject(curr, conf);
+								}
+								// if the representation of the notifier has already been expanded, we need to add the new value to the list, if not it will be done during the expand of the notifier
+								if (this.alreadyExpanded.contains(curr)) {
+									addObject(confRep, newValue);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param notification
+	 */
+	@Override
+	protected void manageAddManyNotification(final Notification notification) {
+		final Object tmpValues = notification.getNewValue();
+		if (!(tmpValues instanceof Collection<?>)) {
+			return;
+		}
+
+		final Collection<?> values = (Collection<?>) tmpValues;
+		Object notifier = notification.getNotifier();
+		Object feature = notification.getFeature();
+
+		// case 1 - the user added a new roots axis by DnD
+		if (feature == NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis()) {
+			for (Object value : values) {
+				if (value instanceof ITreeItemAxis && !(((ITreeItemAxis) value).getElement() instanceof ITreeItemAxis)) {
+					manageAddITreeItemAxisForSemanticElement((ITreeItemAxis) value);
+				}
+			}
+			return;
+		}
+
+		// case 2 : the notifier is the context of the table and we have filling configuration for level 0
+		if (notifier == getTableContext() && FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), 0)) {
+			for (final TreeFillingConfiguration current : FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, 0)) {
+
+				// all values to display for this conf
+				Collection<?> rows = getFilteredValueAsCollection(current, notifier, 0);
+				// all values to add
+				values.retainAll(rows);
+
+				if (values.size() > 0) {
+					Set<ITreeItemAxis> parentRepresentation = this.managedElements.get(current);
+					// we are on the root, so the set is null or its size is 1;
+					Assert.isTrue(parentRepresentation == null || parentRepresentation.size() == 1);
+					ITreeItemAxis confRep;
+					if (parentRepresentation == null) {
+						confRep = addObject(null, current);
+					} else {
+						confRep = parentRepresentation.iterator().next();
+					}
+					// only one representation
+					for (Object currVal : values) {
+						addObject(confRep, currVal);
+					}
+				}
+			}
+			return;
+		}
+
+		// case 3 - the notifier is a known element
+		if (!this.managedElements.containsKey(notifier)) {
+			return;
+		}
+		final Set<ITreeItemAxis> itemAxisRepresentations = this.managedElements.get(notifier);
+		// we need to add a child for each representation of its parent in the table
+		for (final ITreeItemAxis curr : itemAxisRepresentations) {
+
+			if (curr.getParent() == null || this.alreadyExpanded.contains(curr.getParent())) {
+				// 1.1 : get the depth for the new value
+				int nextDepth = getSemanticDepth(curr) + 1;
+				for (Object newValue : values) {
+					// 1.2 verify than the new value is allowed
+					if (FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth)) {
+
+						// we cross the possible confs for this level
+						for (TreeFillingConfiguration conf : FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth)) {
+							if (isProvidedByTreeFillingConfiguration(newValue, conf, notifier)) {
+								// we must add the value
+								ITreeItemAxis confRep = getITreeItemAxisRepresentingObject(curr.getChildren(), conf);
+								if (confRep == null) {
+									confRep = addObject(curr, conf);
+								}
+								// if the representation of the notifier has already been expanded, we need to add the new value to the list, if not it will be done during the expand of the notifier
+								if (this.alreadyExpanded.contains(curr)) {
+									addObject(confRep, newValue);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param notification
+	 */
+	@Override
+	protected void manageMoveNotification(Notification notification) {
+		// no usecase found
+	}
+
+	protected void manageRemoveITreeItemAxisForSemanticElement(final ITreeItemAxis axis) {
+		Assert.isTrue((axis.getElement() instanceof TreeFillingConfiguration) == false);
+		removeObject(axis);
+	}
+
+	/**
+	 * @param notification
+	 */
+	@Override
+	protected void manageRemoveNotification(Notification notification) {
+		final Object oldValue = notification.getOldValue();
+
+		// a ITreeItemAxis is destroyed
+		if (oldValue instanceof ITreeItemAxis && !(((IAxis) oldValue).getElement() instanceof TreeFillingConfiguration)) {
+			removeObject((ITreeItemAxis) oldValue);
+			return;
+		}
+
+		manageRemoveSemanticElement(oldValue);
+	}
+
+	protected void manageRemoveSemanticElement(Object object) {
+		Assert.isTrue(false == (object instanceof ITreeItemAxis));
+		Assert.isTrue(false == (object instanceof TreeFillingConfiguration));
+		if (this.managedElements.containsKey(object)) {
+			Collection<ITreeItemAxis> itemAxisRepresentations = new ArrayList<ITreeItemAxis>(this.managedElements.get(object));
+			for (final ITreeItemAxis current : itemAxisRepresentations) {
+				ITreeItemAxis parent = current.getParent();
+				// must always be a TreeFillingConfiguration
+				TreeFillingConfiguration conf = (TreeFillingConfiguration) parent.getElement();
+				Object context;
+				ITreeItemAxis greatParent = parent.getParent();
+				if (greatParent == null) {
+					context = getTableContext();
+				} else {
+					context = greatParent.getElement();
+				}
+				Collection<?> values = getCellValueAsCollection(conf.getAxisUsedAsAxisProvider(), context);
+				if (!values.contains(object)) {
+					removeObject(current);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * @param notification
+	 */
+	@Override
+	protected void manageRemoveManyNotification(Notification notification) {
+		final Object tmpOldValues = notification.getOldValue();
+		if (!(tmpOldValues instanceof Collection<?>)) {
+			return;
+		}
+
+		Collection<?> oldValues = (Collection<?>) tmpOldValues;
+		Object feature = notification.getFeature();
+
+		// case 1 - a root IAxis has been destroyed by the user
+		if (feature == NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis()) {
+			for (Object value : oldValues) {
+				if (value instanceof ITreeItemAxis && !(((ITreeItemAxis) value).getElement() instanceof ITreeItemAxis)) {
+					manageRemoveITreeItemAxisForSemanticElement((ITreeItemAxis) value);
+				}
+			}
+			return;
+		}
+
+		// case 2 - a semantic element has been removed
+		for (Object val : oldValues) {
+			manageRemoveSemanticElement(val);
+		}
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)
+	 *
+	 * @param axisIndex
+	 * @return
+	 */
+	@Override
+	public boolean canDestroyAxisElement(Integer axisIndex) {
+		return false;
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Integer)
+	 *
+	 * @param domain
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {
+		return null;
+	}
+
+	/**
+	 * Update the children of semanticElementRepresentation OR the roots of the table if the parameter is <code>null</code>
+	 *
+	 * Not really tested and not yet used in an offical Papyrus table
+	 *
+	 * @param semanticElementRepresentation
+	 *            a {@link ITreeItemAxis} for which we want update the children, could be <code>null</code>, in this case we will update the root elements of the table
+	 */
+	protected void updateChildren(final ITreeItemAxis semanticElementRepresentation) {
+		Assert.isTrue(semanticElementRepresentation == null || !(semanticElementRepresentation.getElement() instanceof TreeFillingConfiguration));
+		ITreeItemAxis current = semanticElementRepresentation;
+		if (current == null || (current.getParent() != null && this.alreadyExpanded.contains(current.getParent()))) {
+			int nextDepth;
+			Object context;
+			if (semanticElementRepresentation == null) {
+				nextDepth = 0;
+				context = getTableContext();
+			} else {
+				nextDepth = getSemanticDepth(semanticElementRepresentation) + 1;
+				context = semanticElementRepresentation.getElement();
+			}
+
+			List<TreeFillingConfiguration> confs = FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, nextDepth);
+			for (TreeFillingConfiguration conf : confs) {
+				ITreeItemAxis confRep = null;
+				if (current != null) {
+					confRep = getITreeItemAxisRepresentingObject(current.getChildren(), conf);
+				} else if (nextDepth == 0) {
+					if (managedElements.containsKey(conf)) {
+						// we are on the root of the table, so the configuration can be represented only one time in the map
+						confRep = managedElements.get(conf).iterator().next();
+					}
+				}
+
+				final Collection<?> values = getFilteredValueAsCollection(conf, context, nextDepth);
+				List<Object> knownElements = new ArrayList<Object>();
+				List<ITreeItemAxis> toRemove = new ArrayList<ITreeItemAxis>();
+				if (confRep != null) {
+					List<ITreeItemAxis> children = new ArrayList<ITreeItemAxis>(confRep.getChildren());
+					for (ITreeItemAxis child : children) {
+						Object tmp = child.getElement();
+						if (!values.contains(tmp)) {
+							toRemove.add(child); // we can't remove them now, because confRep could be destroy here, and maybe we need it after
+						}
+						knownElements.add(child.getElement());
+					}
+					values.removeAll(knownElements);
+					if (alreadyExpanded.contains(current)) {
+						for (Object val : values) {
+							addObject(confRep, val);
+						}
+					}
+
+					for (ITreeItemAxis axis : toRemove) {
+						removeObject(axis);
+					}
+				} else if (false == values.isEmpty()) {
+					confRep = addObject(current, conf);
+					if (alreadyExpanded.contains(current) || current == null) {// current==null for root
+						for (Object val : values) {
+							addObject(confRep, val);
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * This method updates the contents of the table
+	 *
+	 * @param semanticElement
+	 *            the semantic element for which we want to update the visibility
+	 */
+	protected void updateSemanticElement(final Object semanticElement) {
+		if (FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(getTable(), representedAxisManager, 0)) {
+			// we update all the roots of the table : the element could be now visible or hidden
+			updateChildren(null);
+		}
+
+		if (this.managedElements.containsKey(semanticElement)) {
+			for (ITreeItemAxis sementicItemRep : this.managedElements.get(semanticElement)) {
+				updateChildren(sementicItemRep);
+			}
+		}
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#managedHideShowCategoriesForDepth(java.util.List, java.util.List)
+	 *
+	 * @param depthToHide
+	 * @param depthToShow
+	 */
+	@Override
+	public void managedHideShowCategoriesForDepth(List<Integer> depthToHide, List<Integer> depthToShow) {
+		hideCategories(depthToHide);
+		showCategoriesForDepth(depthToShow);
+	}
+
+	/**
+	 *
+	 * @param depthToHide
+	 *            the list of the depth for which we want to hide the categories
+	 */
+	protected void hideCategories(final List<Integer> depthToHide) {
+		if (depthToHide == null || depthToHide.isEmpty()) {
+			return;
+		}
+		RowHideShowLayer rowHideLayer = getRowHideShowLayer();
+		if (rowHideLayer == null) {
+			return;
+		}
+		NatTable natTable = (NatTable) getTableManager().getAdapter(NatTable.class);
+		if (natTable == null) {
+			return;
+		}
+		if (depthToHide != null && depthToHide.size() > 0) {
+			Set<Integer> indexesToHide = new TreeSet<Integer>();
+			for (Integer curr : depthToHide) {
+				List<TreeFillingConfiguration> fillingConf = FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, curr);
+				for (TreeFillingConfiguration treeFillingConfiguration : fillingConf) {
+					if (this.managedElements.containsKey(treeFillingConfiguration)) {
+						for (ITreeItemAxis axis : this.managedElements.get(treeFillingConfiguration)) {
+							int index = getTableManager().getRowElementsList().indexOf(axis);
+							ITreeItemAxis parentAxis = axis.getParent();
+							if (parentAxis != null && parentAxis.isExpanded() && !axis.isExpanded()) {
+								getTreeLayer().expandTreeRow(index);
+								index = getTableManager().getRowElementsList().indexOf(axis);
+							} else if (parentAxis == null) {
+								getTreeLayer().expandTreeRow(index);
+								index = getTableManager().getRowElementsList().indexOf(axis);
+							}
+
+							if (index != -1) {// -1 when not yet visible
+								int convertedIndex = rowHideLayer.underlyingToLocalRowPosition(natTable, index);
+								indexesToHide.add(convertedIndex);
+							}
+						}
+					}
+				}
+			}
+
+			if (indexesToHide.size() > 0) {
+				int[] ar = new int[indexesToHide.size()];
+				Iterator<Integer> iter = indexesToHide.iterator();
+				int i = 0;
+				while (iter.hasNext()) {
+					ar[i] = iter.next();
+					i++;
+				}
+				natTable.doCommand(new MultiRowHideCommand(rowHideLayer, ar));
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @param depthToHide
+	 *            the list of the depth for which we want to hide the categories
+	 */
+	protected void showCategoriesForDepth(final List<Integer> depthToShow) {
+		if (depthToShow == null || depthToShow.isEmpty()) {
+			return;
+		}
+		NatTable natTable = (NatTable) getTableManager().getAdapter(NatTable.class);
+		if (natTable == null) {
+			return;
+		}
+		List<Integer> indexesToShow = new ArrayList<Integer>();
+		for (Integer curr : depthToShow) {
+			List<TreeFillingConfiguration> fillingConf = FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, curr);
+			for (TreeFillingConfiguration treeFillingConfiguration : fillingConf) {
+				if (this.managedElements.containsKey(treeFillingConfiguration)) {
+					for (ITreeItemAxis axis : this.managedElements.get(treeFillingConfiguration)) {
+						indexesToShow.add(getTableManager().getRowElementsList().indexOf(axis));
+					}
+				}
+			}
+		}
+		if (indexesToShow.size() > 0) {
+			natTable.doCommand(new MultiRowShowCommand(indexesToShow));
+		}
+	}
+
+	/**
+	 *
+	 * @return
+	 *         the row hide show layer
+	 */
+	protected final RowHideShowLayer getRowHideShowLayer() {
+		if (this.tableManager != null && this.tableManager.getBodyLayerStack() != null) {
+			return this.tableManager.getBodyLayerStack().getRowHideShowLayer();
+		}
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#fillingConfigurationsHaveChanged()
+	 *
+	 */
+	@Override
+	public void fillingConfigurationsHaveChanged() {
+		List<TreeFillingConfiguration> oldFillingConfiguration = this.currentFillingConfiguration;
+		List<TreeFillingConfiguration> newFillingConf = FillingConfigurationUtils.getTreeFillingConfiguration(getTable(), this.representedAxisManager);
+		this.currentFillingConfiguration = newFillingConf;
+		if (oldFillingConfiguration.equals(newFillingConf)) {
+			return;
+		}
+
+
+		// 1. we remove all filling configuration which have been deleted
+		List<TreeFillingConfiguration> confToRemove = new ArrayList<TreeFillingConfiguration>(oldFillingConfiguration);
+		confToRemove.removeAll(newFillingConf);
+		for (TreeFillingConfiguration current : confToRemove) {
+			if (managedElements.containsKey(current)) {
+				Set<ITreeItemAxis> axisRepresentation = new HashSet<ITreeItemAxis>(managedElements.get(current));
+				for (ITreeItemAxis tmp : axisRepresentation) {
+					removeObject(tmp);
+				}
+			}
+		}
+
+		List<TreeFillingConfiguration> confToAdd = new ArrayList<TreeFillingConfiguration>(newFillingConf);
+		confToAdd.removeAll(oldFillingConfiguration);
+		if (confToAdd.isEmpty()) {
+			return;
+		}
+		for (TreeFillingConfiguration treeFillingConfiguration : confToAdd) {
+			int depth = treeFillingConfiguration.getDepth();
+			if (depth == 0) {
+				updateChildren(null);
+			} else {
+				for (TreeFillingConfiguration previousConfig : FillingConfigurationUtils.getTreeFillingConfigurationForDepth(getTable(), representedAxisManager, depth - 1)) {
+					if (this.managedElements.containsKey(previousConfig)) {
+						for (ITreeItemAxis axis : this.managedElements.get(previousConfig)) {
+							for (ITreeItemAxis child : axis.getChildren()) {
+								updateSemanticElement(child.getElement());
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java
index ede430742db..7860fdc3226 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java
@@ -1,791 +1,791 @@
-/*****************************************************************************

- * Copyright (c) 2012 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.manager.axis;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.Iterator;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.command.MoveCommand;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.util.TransactionUtil;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-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.utils.AxisComparator;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.widgets.providers.CompoundFilteredRestrictedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-

-/**

- * This axis manager allows to encapsulated others axis manager. It allows to manage the contents of the table.

- * When this contents is stored in the table metamodel, It is able to manage the Add/Remove and Move elements in the list of the displayed elements

- *

- * @author VL222926

- *

- */

-public class CompositeAxisManager extends AbstractAxisManager implements ICompositeAxisManager {

-

-	/**

-	 * the id of this manager

-	 */

-	@SuppressWarnings("unused")

-	private static final String MANAGER_ID = "org.eclipse.papyrus.infra.nattable.composite.axis.manager"; //$NON-NLS-1$

-

-	/**

-	 * the sub managers

-	 */

-	protected List<IAxisManager> subManagers;

-

-	/**

-	 * the comparator used to sort the axis

-	 */

-	protected Comparator<Object> axisComparator;

-

-	/**

-	 *

-	 * @param notification

-	 *            the notification

-	 */

-	@Override

-	protected void axisManagerHasChanged(final Notification notification) {

-		if (notification.isTouch()) {

-			return;

-		}

-		final List<Object> newListValue = new ArrayList<Object>(this.managedObject);

-		boolean needRefresh = false;

-		int eventType = notification.getEventType();

-		switch (eventType) {

-		case Notification.ADD:

-			final Object addedValue = notification.getNewValue();

-			final int index = notification.getPosition();

-

-			newListValue.add(index, addedValue);

-			needRefresh = true;

-			break;

-		case Notification.ADD_MANY:

-			final Collection<?> addedValues = (Collection<?>) notification.getNewValue();

-			// final int lisIndex = notification.getPosition();

-			newListValue.addAll(addedValues);

-			needRefresh = true;

-			break;

-		case Notification.EVENT_TYPE_COUNT:

-			break;

-		case Notification.MOVE:

-			final Object movedObject = notification.getNewValue();

-			final int newPos = notification.getPosition();

-			newListValue.remove(movedObject);

-			newListValue.add(newPos, movedObject);

-			needRefresh = true;

-			break;

-		case Notification.REMOVE:

-			final Object removedObject = notification.getOldValue();

-			newListValue.remove(removedObject);

-			needRefresh = true;

-			break;

-		case Notification.REMOVE_MANY:

-			final Collection<?> removedValues = (Collection<?>) notification.getOldValue();

-			newListValue.removeAll(removedValues);

-			needRefresh = true;

-			break;

-		case Notification.REMOVING_ADAPTER:

-			break;

-		case Notification.RESOLVE:

-			break;

-		case Notification.SET:

-			break;

-		case Notification.UNSET:

-			break;

-		// case Notification.NO_FEATURE_ID:

-		// break;

-		// case Notification.NO_INDEX:

-		// break;

-		default:

-			break;

-		}

-		if (needRefresh) {

-			this.managedObject.clear();

-			this.managedObject.addAll(newListValue);

-			newListValue.clear();

-			getTableManager().updateAxisContents(getRepresentedContentProvider());

-		}

-

-	}

-

-

-	/**

-	 * Initialize the list of the managed elements which are owned by the model

-	 */

-	@Override

-	protected void initializeManagedObjectList() {

-		for (final IAxis current : getRepresentedContentProvider().getAxis()) {

-			this.managedObject.add(current);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#setSubAxisManager(java.util.List)

-	 *

-	 * @param managers

-	 */

-	@Override

-	public void setSubAxisManager(final List<IAxisManager> managers) {

-		this.subManagers = managers;

-		updateAxisContents();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		super.dispose();

-		for (final IAxisManager current : this.subManagers) {

-			current.dispose();

-		}

-		this.subManagers.clear();

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsRowManager()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canBeUsedAsRowManager() {

-		boolean answer = true;

-		final Iterator<IAxisManager> iter = this.subManagers.iterator();

-		while (iter.hasNext() && answer) {

-			answer = iter.next().canBeUsedAsRowManager();

-		}

-		return answer;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsColumnManager()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canBeUsedAsColumnManager() {

-		boolean answer = true;

-		final Iterator<IAxisManager> iter = this.subManagers.iterator();

-		while (iter.hasNext() && answer) {

-			answer = iter.next().canBeUsedAsColumnManager();

-		}

-		return answer;

-	}

-

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		boolean canCreateAxisElement = false;

-		for (IAxisManager manager : subManagers) {

-			canCreateAxisElement |= manager.canCreateAxisElement(elementId);

-		}

-		return canCreateAxisElement;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAddAxisCommand(TransactionalEditingDomain, java.util.Collection)

-	 *

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {

-		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_AddAxisCommand);

-		for (final IAxisManager current : this.subManagers) {

-			final Command tmp = current.getAddAxisCommand(domain, objectToAdd);

-			if (tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		if (cmd.isEmpty()) {

-			return null;

-		}

-		return cmd;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getComplementaryAddAxisCommand(TransactionalEditingDomain, java.util.Collection)

-	 *

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getComplementaryAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {

-		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_AddAxisCommand);

-		for (final IAxisManager current : this.subManagers) {

-			final Command tmp = current.getComplementaryAddAxisCommand(domain, objectToAdd);

-			if (tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		if (cmd.isEmpty()) {

-			return null;

-		}

-		return cmd;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#updateAxisContents()

-	 *

-	 */

-	@Override

-	public synchronized void updateAxisContents() {

-		final List<Object> displayedElement = getElements();

-		synchronized (displayedElement) {

-			displayedElement.clear();

-			displayedElement.addAll(this.managedObject);

-			if (this.subManagers != null) {

-				for (final IAxisManager current : this.subManagers) {

-					if (current.isDynamic()) {

-						displayedElement.addAll(current.getAllManagedAxis());

-					}

-				}

-			}

-			if (this.axisComparator != null) {

-				Collections.sort(displayedElement, this.axisComparator);

-			} else {

-

-			}

-		}

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAllowedContents(Object object) {

-		for (final IAxisManager current : this.subManagers) {

-			if (current.isAllowedContents(object)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canMoveAxis()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canMoveAxis() {

-		for (final IAxisManager current : this.subManagers) {

-			if (!current.canMoveAxis() || current.isDynamic()) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#sortAxisByName(boolean, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param inverted

-	 * @param configRegistry

-	 */

-	@Override

-	public void sortAxisByName(boolean alphabeticOrder, final IConfigRegistry configRegistry) {

-		if (canMoveAxis()) {

-			final List<IAxis> axis = new ArrayList<IAxis>(getRepresentedContentProvider().getAxis());

-			Collections.sort(axis, new AxisComparator(alphabeticOrder, configRegistry));

-			final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(getRepresentedContentProvider());

-			final AbstractEditCommandRequest request = new SetRequest(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), axis);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getRepresentedContentProvider());

-			final ICommand cmd = provider.getEditCommand(request);

-			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-		}

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#createPossibleAxisContentProvider(boolean)

-	 *

-	 * @param isRestricted

-	 * @return a contents provider for this axis or <code>null</code> if it is not allowed

-	 */

-	@Override

-	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {

-

-		CompoundFilteredRestrictedContentProvider compoundContentProvider = null;

-		for (final IAxisManager current : this.subManagers) {

-			IRestrictedContentProvider contentProvider = current.createPossibleAxisContentProvider(isRestricted);

-			if (contentProvider != null) {

-				if (compoundContentProvider == null) {

-					compoundContentProvider = new CompoundFilteredRestrictedContentProvider();

-				}

-				compoundContentProvider.add(contentProvider);

-			}

-		}

-		return compoundContentProvider;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getDestroyAxisCommand(TransactionalEditingDomain, java.util.Collection)

-	 *

-	 * @param domain

-	 * @param objectToDestroy

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisCommand(TransactionalEditingDomain domain, Collection<Object> objectToDestroy) {

-		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_DestroyAxisCommand);

-		for (final IAxisManager current : this.subManagers) {

-			final Command tmp = current.getDestroyAxisCommand(domain, objectToDestroy);

-			if (tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		if (cmd.isEmpty()) {

-			return null;

-		}

-		return cmd;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()

-	 *

-	 * @return

-	 */

-	@Override

-	public List<Object> getAllManagedAxis() {

-		initializeManagedObjectList();

-		final List<Object> allExistingAxis = new ArrayList<Object>();

-		for (IAxisManager manager : this.subManagers) {

-			Collection<Object> managerPossibleElements = manager.getAllManagedAxis();

-			if (managerPossibleElements != null) {

-				allExistingAxis.addAll(managerPossibleElements);

-			}

-		}

-		return allExistingAxis;

-	}

-

-	/**

-	 *

-	 * @param resolve

-	 *            if <code>true</code> the path will be resolved

-	 * @return

-	 * 		a list with the managed objects

-	 */

-	public List<Object> getAllManagedAxis(final boolean resolve) {

-		final List<Object> allExistingAxis = new ArrayList<Object>();

-		for (final IAxis current : getRepresentedContentProvider().getAxis()) {

-			Object representedElement = AxisUtils.getRepresentedElement(current);

-			if (resolve && current instanceof IdAxis) {

-				representedElement = getResolvedPath((IdAxis) current);

-			}

-			allExistingAxis.add(representedElement);

-		}

-		for (IAxisManager manager : this.subManagers) {

-			if (manager.isDynamic()) {

-				final List<Object> managerPossibleElements = manager.getAllManagedAxis();

-				if (managerPossibleElements != null) {

-					allExistingAxis.addAll(managerPossibleElements);

-				}

-			}

-		}

-		return allExistingAxis;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()

-	 *

-	 * @return

-	 *         <code>true</code> if one of the encapsulated manager is a slave

-	 */

-	@Override

-	public boolean isSlave() {

-		for (final IAxisManager manager : this.subManagers) {

-			if (manager.isSlave()) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isDynamic()

-	 *

-	 * @return

-	 *         <code>true</code> if one of the embedded axis manager is dynamic

-	 */

-	@Override

-	public boolean isDynamic() {

-		for (final IAxisManager manager : this.subManagers) {

-			if (manager.isDynamic()) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)

-	 *

-	 * @param objectsToAdd

-	 * @return

-	 */

-	@Override

-	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {

-		for (final IAxisManager current : this.subManagers) {

-			if (current.canDropAxisElement(objectsToAdd)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-

-	/**

-	 *

-	 * @param elementToMove

-	 * @param newIndex

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#moveAxis(java.lang.Object, int)

-	 */

-	@Override

-	public void moveAxis(Object elementToMove, int newIndex) {

-		if (!isDynamic() && elementToMove instanceof IAxis) {

-			TransactionalEditingDomain domain = getTableEditingDomain();

-			final Command command = MoveCommand.create(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), elementToMove, newIndex);

-			domain.getCommandStack().execute(command);

-		}

-	}

-

-	@Override

-	public boolean canEditAxisHeader(final NatEventData axisIndex) {

-		axisIndex.getColumnPosition();// TODO

-		if (canEditAxisHeader()) {// TODO

-			return true;

-		} else {

-			return false;// TODO : we need to iterate on the contents to know if it is possible or not

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canEditAxisHeader()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canEditAxisHeader() {

-		for (final IAxisManager current : this.subManagers) {

-			if (!current.canEditAxisHeader()) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getElementAxisName(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis)

-	 *

-	 * @param axis

-	 * @return

-	 */

-	@Override

-	public String getElementAxisName(final IAxis axis) {

-		final AxisManagerRepresentation manager = axis.getManager();

-		for (final IAxisManager man : this.subManagers) {

-			if (man.getAxisManagerRepresentation() == manager) {

-				return man.getElementAxisName(axis);

-			}

-		}

-		if (canEditAxisHeader()) {

-			return null;

-		} else {

-			throw new UnsupportedOperationException();

-		}

-	}

-

-	/**

-	 *

-	 * @param axis

-	 *            an axis

-	 * @return

-	 * 		the axis manager managing this axis

-	 */

-	protected IAxisManager getAxisManager(final IAxis axis) {

-		final AxisManagerRepresentation rep = axis.getManager();

-		for (final IAxisManager man : this.subManagers) {

-			if (man.getAxisManagerRepresentation() == rep) {

-				return man;

-			}

-		}

-		return null;// must be impossible

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDestroyAxis(java.lang.Integer)

-	 *

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxis(final Integer axisPosition) {

-		final List<Object> elements = getElements();

-		final Object element = elements.get(axisPosition);

-		if (element instanceof IAxis) {

-			return getAxisManager((IAxis) element).canDestroyAxis(axisPosition);

-		}

-		// not yet managed

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)

-	 *

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxisElement(Integer axisPosition) {

-		final List<Object> elements = getElements();

-		final Object element = elements.get(axisPosition);

-		if (element instanceof IAxis) {

-			return getAxisManager((IAxis) element).canDestroyAxisElement(axisPosition);

-		} else if (subManagers.size() == 1) {

-			return subManagers.get(0).canDestroyAxisElement(axisPosition);

-		}

-		// not yet managed

-		return false;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)

-	 *

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {

-		final List<Object> elements = getElements();

-		final Object element = elements.get(axisPosition);

-		if (element instanceof IAxis) {

-			return getAxisManager((IAxis) element).getDestroyAxisElementCommand(domain, axisPosition);

-		} else if (subManagers.size() == 1) {

-			return subManagers.get(0).getDestroyAxisElementCommand(domain, axisPosition);

-		}

-		// not yet managed

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	@Override

-	public boolean canBeSavedAsConfig() {

-		boolean canBeSavedAsConfig = true;

-		for (IAxisManager manager : subManagers) {

-			canBeSavedAsConfig &= manager.canBeSavedAsConfig();

-		}

-		return canBeSavedAsConfig;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAdapter(java.lang.Class)

-	 *

-	 * @param adapter

-	 * @return

-	 */

-	@Override

-	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {

-		for (final IAxisManager current : this.subManagers) {

-			if (current.getClass() == adapter) {

-				return current;

-			}

-		}

-		return super.getAdapter(adapter);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#isInSortedState()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isInSortedState() {

-		return this.axisComparator != null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#setAxisComparator(java.util.Comparator)

-	 *

-	 * @param comp

-	 */

-	@Override

-	public void setAxisComparator(final Comparator<Object> comp) {

-		this.axisComparator = comp;

-		if (this.axisComparator != null) {

-			List<Object> displayedElement = getElements();

-			synchronized (displayedElement) {

-				Collections.sort(displayedElement, comp);

-				getTableManager().refreshNatTable();// useful?

-			}

-		} else {

-			getTableManager().updateAxisContents(getRepresentedContentProvider());

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAlreadyManaged(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAlreadyManaged(final Object object) {

-		for (final IAxisManager current : this.subManagers) {

-			if (current.isAlreadyManaged(object)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#getSetNewAxisOrderCommand(java.util.List)

-	 *

-	 * @param newOrder

-	 * @return

-	 */

-	@Override

-	public Command getSetNewAxisOrderCommand(final List<Object> newOrder) {

-		if (canMoveAxis() && !isDynamic()) {

-			return new RecordingCommand(getTableEditingDomain()) {

-

-				@Override

-				protected void doExecute() {

-					final TreeMap<Integer, IAxis> order = new TreeMap<Integer, IAxis>();

-					final AbstractAxisProvider provider = getRepresentedContentProvider();

-					for (int i = 0; i < provider.getAxis().size(); i++) {

-						final IAxis currentAxis = provider.getAxis().get(i);

-						int index = newOrder.indexOf(currentAxis);

-						if (index != -1) {

-							order.put(Integer.valueOf(index), currentAxis);

-						} else {

-							Object resolvedObject = AxisUtils.getRepresentedElement(currentAxis);

-							if (currentAxis instanceof IdAxis) {

-								resolvedObject = getResolvedPath((IdAxis) currentAxis);

-							}

-							index = newOrder.indexOf(resolvedObject);

-							if (index == -1) {

-								throw new IndexOutOfBoundsException("A reordered element can't be resolved"); //$NON-NLS-1$

-							}

-							order.put(Integer.valueOf(index), currentAxis);

-						}

-					}

-

-					final List<IAxis> newValues = new ArrayList<IAxis>();

-					newValues.addAll(order.values());

-					SetCommand.create(getTableEditingDomain(), provider, NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), newValues).execute();

-				}

-			};

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param axisManagerId

-	 *            an axis

-	 * @return

-	 * 		the axis manager managing it

-	 */

-	protected IAxisManager findAxisManager(final IAxis axis) {

-		final String axisManagerId = axis.getManager().getAxisManagerId();

-		for (final IAxisManager currentManager : this.subManagers) {

-			if (currentManager.getAxisManagerRepresentation().getAxisManagerId().equals(axisManagerId)) {

-				return currentManager;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param idAxis

-	 *            an idAxis

-	 * @return

-	 * 		the resolved path or the {@link String} represented by the idAxis if the path can't be resolved

-	 */

-	protected Object getResolvedPath(final IdAxis idAxis) {

-		final String path = idAxis.getElement();

-		final IAxisManager manager = findAxisManager(idAxis);

-		if (manager instanceof IIdAxisManager) {

-			final Object resolvedElement = ((IIdAxisManager) manager).resolvedPath(path);

-			if (resolvedElement != null) {

-				return resolvedElement;

-			}

-		}

-		return path;

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 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.manager.axis;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeMap;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+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.utils.AxisComparator;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.widgets.providers.CompoundFilteredRestrictedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;
+
+/**
+ * This axis manager allows to encapsulated others axis manager. It allows to manage the contents of the table.
+ * When this contents is stored in the table metamodel, It is able to manage the Add/Remove and Move elements in the list of the displayed elements
+ *
+ * @author VL222926
+ *
+ */
+public class CompositeAxisManager extends AbstractAxisManager implements ICompositeAxisManager {
+
+	/**
+	 * the id of this manager
+	 */
+	@SuppressWarnings("unused")
+	private static final String MANAGER_ID = "org.eclipse.papyrus.infra.nattable.composite.axis.manager"; //$NON-NLS-1$
+
+	/**
+	 * the sub managers
+	 */
+	protected List<IAxisManager> subManagers;
+
+	/**
+	 * the comparator used to sort the axis
+	 */
+	protected Comparator<Object> axisComparator;
+
+	/**
+	 *
+	 * @param notification
+	 *            the notification
+	 */
+	@Override
+	protected void axisManagerHasChanged(final Notification notification) {
+		if (notification.isTouch()) {
+			return;
+		}
+		final List<Object> newListValue = new ArrayList<Object>(this.managedObject);
+		boolean needRefresh = false;
+		int eventType = notification.getEventType();
+		switch (eventType) {
+		case Notification.ADD:
+			final Object addedValue = notification.getNewValue();
+			final int index = notification.getPosition();
+
+			newListValue.add(index, addedValue);
+			needRefresh = true;
+			break;
+		case Notification.ADD_MANY:
+			final Collection<?> addedValues = (Collection<?>) notification.getNewValue();
+			// final int lisIndex = notification.getPosition();
+			newListValue.addAll(addedValues);
+			needRefresh = true;
+			break;
+		case Notification.EVENT_TYPE_COUNT:
+			break;
+		case Notification.MOVE:
+			final Object movedObject = notification.getNewValue();
+			final int newPos = notification.getPosition();
+			newListValue.remove(movedObject);
+			newListValue.add(newPos, movedObject);
+			needRefresh = true;
+			break;
+		case Notification.REMOVE:
+			final Object removedObject = notification.getOldValue();
+			newListValue.remove(removedObject);
+			needRefresh = true;
+			break;
+		case Notification.REMOVE_MANY:
+			final Collection<?> removedValues = (Collection<?>) notification.getOldValue();
+			newListValue.removeAll(removedValues);
+			needRefresh = true;
+			break;
+		case Notification.REMOVING_ADAPTER:
+			break;
+		case Notification.RESOLVE:
+			break;
+		case Notification.SET:
+			break;
+		case Notification.UNSET:
+			break;
+		default:
+			break;
+		}
+		if (needRefresh) {
+			this.managedObject.clear();
+			this.managedObject.addAll(newListValue);
+			newListValue.clear();
+			getTableManager().updateAxisContents(getRepresentedContentProvider());
+		}
+
+	}
+
+
+	/**
+	 * Initialize the list of the managed elements which are owned by the model
+	 */
+	@Override
+	protected void initializeManagedObjectList() {
+		for (final IAxis current : getRepresentedContentProvider().getAxis()) {
+			this.managedObject.add(current);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#setSubAxisManager(java.util.List)
+	 *
+	 * @param managers
+	 */
+	@Override
+	public void setSubAxisManager(final List<IAxisManager> managers) {
+		this.subManagers = managers;
+		updateAxisContents();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		super.dispose();
+		for (final IAxisManager current : this.subManagers) {
+			current.dispose();
+		}
+		this.subManagers.clear();
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsRowManager()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canBeUsedAsRowManager() {
+		boolean answer = true;
+		final Iterator<IAxisManager> iter = this.subManagers.iterator();
+		while (iter.hasNext() && answer) {
+			answer = iter.next().canBeUsedAsRowManager();
+		}
+		return answer;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsColumnManager()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canBeUsedAsColumnManager() {
+		boolean answer = true;
+		final Iterator<IAxisManager> iter = this.subManagers.iterator();
+		while (iter.hasNext() && answer) {
+			answer = iter.next().canBeUsedAsColumnManager();
+		}
+		return answer;
+	}
+
+	@Override
+	public boolean canCreateAxisElement(String elementId) {
+		boolean canCreateAxisElement = false;
+		for (IAxisManager manager : subManagers) {
+			canCreateAxisElement |= manager.canCreateAxisElement(elementId);
+		}
+		return canCreateAxisElement;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAddAxisCommand(TransactionalEditingDomain, java.util.Collection)
+	 *
+	 * @param domain
+	 * @param objectToAdd
+	 * @return
+	 */
+	@Override
+	public Command getAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {
+		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_AddAxisCommand);
+		for (final IAxisManager current : this.subManagers) {
+			final Command tmp = current.getAddAxisCommand(domain, objectToAdd);
+			if (tmp != null) {
+				cmd.append(tmp);
+			}
+		}
+		if (cmd.isEmpty()) {
+			return null;
+		}
+		return cmd;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getComplementaryAddAxisCommand(TransactionalEditingDomain, java.util.Collection)
+	 *
+	 * @param domain
+	 * @param objectToAdd
+	 * @return
+	 */
+	@Override
+	public Command getComplementaryAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {
+		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_AddAxisCommand);
+		for (final IAxisManager current : this.subManagers) {
+			final Command tmp = current.getComplementaryAddAxisCommand(domain, objectToAdd);
+			if (tmp != null) {
+				cmd.append(tmp);
+			}
+		}
+		if (cmd.isEmpty()) {
+			return null;
+		}
+		return cmd;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#updateAxisContents()
+	 *
+	 */
+	@Override
+	public synchronized void updateAxisContents() {
+		final List<Object> displayedElement = getElements();
+		synchronized (displayedElement) {
+			displayedElement.clear();
+			displayedElement.addAll(this.managedObject);
+			if (this.subManagers != null) {
+				for (final IAxisManager current : this.subManagers) {
+					if (current.isDynamic()) {
+						displayedElement.addAll(current.getAllManagedAxis());
+					}
+				}
+			}
+			if (this.axisComparator != null) {
+				Collections.sort(displayedElement, this.axisComparator);
+			} else {
+
+			}
+		}
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public boolean isAllowedContents(Object object) {
+		for (final IAxisManager current : this.subManagers) {
+			if (current.isAllowedContents(object)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canMoveAxis()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canMoveAxis() {
+		for (final IAxisManager current : this.subManagers) {
+			if (!current.canMoveAxis() || current.isDynamic()) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#sortAxisByName(boolean, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param inverted
+	 * @param configRegistry
+	 */
+	@Override
+	public void sortAxisByName(boolean alphabeticOrder, final IConfigRegistry configRegistry) {
+		if (canMoveAxis()) {
+			final List<IAxis> axis = new ArrayList<IAxis>(getRepresentedContentProvider().getAxis());
+			Collections.sort(axis, new AxisComparator(alphabeticOrder, configRegistry));
+			final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(getRepresentedContentProvider());
+			final AbstractEditCommandRequest request = new SetRequest(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), axis);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getRepresentedContentProvider());
+			final ICommand cmd = provider.getEditCommand(request);
+			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+		}
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#createPossibleAxisContentProvider(boolean)
+	 *
+	 * @param isRestricted
+	 * @return a contents provider for this axis or <code>null</code> if it is not allowed
+	 */
+	@Override
+	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {
+
+		CompoundFilteredRestrictedContentProvider compoundContentProvider = null;
+		for (final IAxisManager current : this.subManagers) {
+			IRestrictedContentProvider contentProvider = current.createPossibleAxisContentProvider(isRestricted);
+			if (contentProvider != null) {
+				if (compoundContentProvider == null) {
+					compoundContentProvider = new CompoundFilteredRestrictedContentProvider();
+				}
+				compoundContentProvider.add(contentProvider);
+			}
+		}
+		return compoundContentProvider;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getDestroyAxisCommand(TransactionalEditingDomain, java.util.Collection)
+	 *
+	 * @param domain
+	 * @param objectToDestroy
+	 * @return
+	 */
+	@Override
+	public Command getDestroyAxisCommand(TransactionalEditingDomain domain, Collection<Object> objectToDestroy) {
+		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_DestroyAxisCommand);
+		for (final IAxisManager current : this.subManagers) {
+			final Command tmp = current.getDestroyAxisCommand(domain, objectToDestroy);
+			if (tmp != null) {
+				cmd.append(tmp);
+			}
+		}
+		if (cmd.isEmpty()) {
+			return null;
+		}
+		return cmd;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAllManagedAxis()
+	 *
+	 * @return
+	 */
+	@Override
+	public List<Object> getAllManagedAxis() {
+		initializeManagedObjectList();
+		final List<Object> allExistingAxis = new ArrayList<Object>();
+		for (IAxisManager manager : this.subManagers) {
+			Collection<Object> managerPossibleElements = manager.getAllManagedAxis();
+			if (managerPossibleElements != null) {
+				allExistingAxis.addAll(managerPossibleElements);
+			}
+		}
+		return allExistingAxis;
+	}
+
+	/**
+	 *
+	 * @param resolve
+	 *            if <code>true</code> the path will be resolved
+	 * @return
+	 * 		a list with the managed objects
+	 */
+	public List<Object> getAllManagedAxis(final boolean resolve) {
+		final List<Object> allExistingAxis = new ArrayList<Object>();
+		for (final IAxis current : getRepresentedContentProvider().getAxis()) {
+			Object representedElement = AxisUtils.getRepresentedElement(current);
+			if (resolve && current instanceof IdAxis) {
+				representedElement = getResolvedPath((IdAxis) current);
+			}
+			allExistingAxis.add(representedElement);
+		}
+		for (IAxisManager manager : this.subManagers) {
+			if (manager.isDynamic()) {
+				final List<Object> managerPossibleElements = manager.getAllManagedAxis();
+				if (managerPossibleElements != null) {
+					allExistingAxis.addAll(managerPossibleElements);
+				}
+			}
+		}
+		return allExistingAxis;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()
+	 *
+	 * @return
+	 *         <code>true</code> if one of the encapsulated manager is a slave
+	 */
+	@Override
+	public boolean isSlave() {
+		for (final IAxisManager manager : this.subManagers) {
+			if (manager.isSlave()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isDynamic()
+	 *
+	 * @return
+	 *         <code>true</code> if one of the embedded axis manager is dynamic
+	 */
+	@Override
+	public boolean isDynamic() {
+		for (final IAxisManager manager : this.subManagers) {
+			if (manager.isDynamic()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)
+	 *
+	 * @param objectsToAdd
+	 * @return
+	 */
+	@Override
+	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {
+		for (final IAxisManager current : this.subManagers) {
+			if (current.canDropAxisElement(objectsToAdd)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 *
+	 * @param elementToMove
+	 * @param newIndex
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#moveAxis(java.lang.Object, int)
+	 */
+	@Override
+	public void moveAxis(Object elementToMove, int newIndex) {
+		if (!isDynamic() && elementToMove instanceof IAxis) {
+			TransactionalEditingDomain domain = getTableEditingDomain();
+			final Command command = MoveCommand.create(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), elementToMove, newIndex);
+			if(null != domain){
+				domain.getCommandStack().execute(command);
+			}else{
+				command.execute();
+			}
+		}
+	}
+
+	@Override
+	public boolean canEditAxisHeader(final NatEventData axisIndex) {
+		axisIndex.getColumnPosition();// TODO
+		if (canEditAxisHeader()) {// TODO
+			return true;
+		} else {
+			return false;// TODO : we need to iterate on the contents to know if it is possible or not
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canEditAxisHeader()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canEditAxisHeader() {
+		for (final IAxisManager current : this.subManagers) {
+			if (!current.canEditAxisHeader()) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getElementAxisName(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis)
+	 *
+	 * @param axis
+	 * @return
+	 */
+	@Override
+	public String getElementAxisName(final IAxis axis) {
+		final AxisManagerRepresentation manager = axis.getManager();
+		for (final IAxisManager man : this.subManagers) {
+			if (man.getAxisManagerRepresentation() == manager) {
+				return man.getElementAxisName(axis);
+			}
+		}
+		if (canEditAxisHeader()) {
+			return null;
+		} else {
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	/**
+	 *
+	 * @param axis
+	 *            an axis
+	 * @return
+	 * 		the axis manager managing this axis
+	 */
+	protected IAxisManager getAxisManager(final IAxis axis) {
+		final AxisManagerRepresentation rep = axis.getManager();
+		for (final IAxisManager man : this.subManagers) {
+			if (man.getAxisManagerRepresentation() == rep) {
+				return man;
+			}
+		}
+		return null;// must be impossible
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDestroyAxis(java.lang.Integer)
+	 *
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public boolean canDestroyAxis(final Integer axisPosition) {
+		final List<Object> elements = getElements();
+		final Object element = elements.get(axisPosition);
+		if (element instanceof IAxis) {
+			return getAxisManager((IAxis) element).canDestroyAxis(axisPosition);
+		}
+		// not yet managed
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)
+	 *
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public boolean canDestroyAxisElement(Integer axisPosition) {
+		final List<Object> elements = getElements();
+		final Object element = elements.get(axisPosition);
+		if (element instanceof IAxis) {
+			return getAxisManager((IAxis) element).canDestroyAxisElement(axisPosition);
+		} else if (subManagers.size() == 1) {
+			return subManagers.get(0).canDestroyAxisElement(axisPosition);
+		}
+		// not yet managed
+		return false;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)
+	 *
+	 * @param domain
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {
+		final List<Object> elements = getElements();
+		final Object element = elements.get(axisPosition);
+		if (element instanceof IAxis) {
+			return getAxisManager((IAxis) element).getDestroyAxisElementCommand(domain, axisPosition);
+		} else if (subManagers.size() == 1) {
+			return subManagers.get(0).getDestroyAxisElementCommand(domain, axisPosition);
+		}
+		// not yet managed
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	@Override
+	public boolean canBeSavedAsConfig() {
+		boolean canBeSavedAsConfig = true;
+		for (IAxisManager manager : subManagers) {
+			canBeSavedAsConfig &= manager.canBeSavedAsConfig();
+		}
+		return canBeSavedAsConfig;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAdapter(java.lang.Class)
+	 *
+	 * @param adapter
+	 * @return
+	 */
+	@Override
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+		for (final IAxisManager current : this.subManagers) {
+			if (current.getClass() == adapter) {
+				return current;
+			}
+		}
+		return super.getAdapter(adapter);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#isInSortedState()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isInSortedState() {
+		return this.axisComparator != null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#setAxisComparator(java.util.Comparator)
+	 *
+	 * @param comp
+	 */
+	@Override
+	public void setAxisComparator(final Comparator<Object> comp) {
+		this.axisComparator = comp;
+		if (this.axisComparator != null) {
+			List<Object> displayedElement = getElements();
+			synchronized (displayedElement) {
+				Collections.sort(displayedElement, comp);
+				getTableManager().refreshNatTable();// useful?
+			}
+		} else {
+			getTableManager().updateAxisContents(getRepresentedContentProvider());
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAlreadyManaged(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public boolean isAlreadyManaged(final Object object) {
+		for (final IAxisManager current : this.subManagers) {
+			if (current.isAlreadyManaged(object)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#getSetNewAxisOrderCommand(java.util.List)
+	 *
+	 * @param newOrder
+	 * @return
+	 */
+	@Override
+	public Command getSetNewAxisOrderCommand(final List<Object> newOrder) {
+		if (canMoveAxis() && !isDynamic()) {
+			return new RecordingCommand(getTableEditingDomain()) {
+
+				@Override
+				protected void doExecute() {
+					final TreeMap<Integer, IAxis> order = new TreeMap<Integer, IAxis>();
+					final AbstractAxisProvider provider = getRepresentedContentProvider();
+					for (int i = 0; i < provider.getAxis().size(); i++) {
+						final IAxis currentAxis = provider.getAxis().get(i);
+						int index = newOrder.indexOf(currentAxis);
+						if (index != -1) {
+							order.put(Integer.valueOf(index), currentAxis);
+						} else {
+							Object resolvedObject = AxisUtils.getRepresentedElement(currentAxis);
+							if (currentAxis instanceof IdAxis) {
+								resolvedObject = getResolvedPath((IdAxis) currentAxis);
+							}
+							index = newOrder.indexOf(resolvedObject);
+							if (index == -1) {
+								throw new IndexOutOfBoundsException("A reordered element can't be resolved"); //$NON-NLS-1$
+							}
+							order.put(Integer.valueOf(index), currentAxis);
+						}
+					}
+
+					final List<IAxis> newValues = new ArrayList<IAxis>();
+					newValues.addAll(order.values());
+					SetCommand.create(getTableEditingDomain(), provider, NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), newValues).execute();
+				}
+			};
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param axisManagerId
+	 *            an axis
+	 * @return
+	 * 		the axis manager managing it
+	 */
+	protected IAxisManager findAxisManager(final IAxis axis) {
+		final String axisManagerId = axis.getManager().getAxisManagerId();
+		for (final IAxisManager currentManager : this.subManagers) {
+			if (currentManager.getAxisManagerRepresentation().getAxisManagerId().equals(axisManagerId)) {
+				return currentManager;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param idAxis
+	 *            an idAxis
+	 * @return
+	 * 		the resolved path or the {@link String} represented by the idAxis if the path can't be resolved
+	 */
+	protected Object getResolvedPath(final IdAxis idAxis) {
+		final String path = idAxis.getElement();
+		final IAxisManager manager = findAxisManager(idAxis);
+		if (manager instanceof IIdAxisManager) {
+			final Object resolvedElement = ((IIdAxisManager) manager).resolvedPath(path);
+			if (resolvedElement != null) {
+				return resolvedElement;
+			}
+		}
+		return path;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java
index 5685764f946..2b24c6312f9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManagerForEventList.java
@@ -1,844 +1,847 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * 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:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.manager.axis;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.Iterator;

-import java.util.List;

-import java.util.TreeMap;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.common.command.UnexecutableCommand;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.command.MoveCommand;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.ResourceSetListener;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.util.TransactionUtil;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.listener.UpdateTableContentListener;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-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.utils.AxisComparator;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.utils.EventListHelper;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.widgets.providers.CompoundFilteredRestrictedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-

-import ca.odell.glazedlists.EventList;

-

-/**

- * @author VL222926

- *

- */

-public class CompositeAxisManagerForEventList extends AbstractAxisManagerForEventList implements IAxisManagerForEventList, ICompositeAxisManager {

-

-	/**

-	 * the id of this manager

-	 */

-	@SuppressWarnings("unused")

-	private static final String MANAGER_ID = "org.eclipse.papyrus.infra.nattable.composite.axis.manager.event.list"; //$NON-NLS-1$

-

-	/**

-	 * the sub managers

-	 */

-	protected List<IAxisManagerForEventList> subManagers;

-

-	/**

-	 * the comparator used to sort the axis

-	 */

-	protected Comparator<Object> axisComparator;

-

-	/**

-	 * the resouce set listener

-	 */

-	private ResourceSetListener resourceSetListener;

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public CompositeAxisManagerForEventList(final EventList<Object> eventList) {

-		setEventList(eventList);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#addListeners()

-	 *

-	 */

-	@Override

-	protected void addListeners() {

-		this.resourceSetListener = new UpdateTableContentListener(getTableManager(), this);

-		getTableEditingDomain().addResourceSetListener(this.resourceSetListener);

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#setSubAxisManager(java.util.List)

-	 *

-	 * @param managers

-	 */

-	@Override

-	public final void setSubAxisManager(final List<IAxisManager> managers) {

-		throw new UnsupportedOperationException("Use setSubAxisManagers(List<IAxisManagerForEventList> manager)"); //$NON-NLS-1$

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#init(org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager, org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation,

-	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider)

-	 *

-	 * @param manager

-	 * @param rep

-	 * @param provider

-	 */

-	@Override

-	public void init(INattableModelManager manager, AxisManagerRepresentation rep, AbstractAxisProvider provider) {

-		super.init(manager, rep, provider);

-		for (final IAxis current : getRepresentedContentProvider().getAxis()) {

-			if (current instanceof ITreeItemAxis) {

-				EventListHelper.addToEventList(eventList, current);

-			}

-		}

-	}

-

-	/**

-	 * @param subManagers

-	 *            the subManagers to set

-	 */

-	public void setSubManagers(List<IAxisManagerForEventList> subManagers) {

-		this.subManagers = subManagers;

-		for (IAxisManagerForEventList current : subManagers) {

-			current.setEventList(eventList);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		removeListeners();

-		super.dispose();

-		for (final IAxisManager current : this.subManagers) {

-			current.dispose();

-		}

-		this.subManagers.clear();

-

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#removeListeners()

-	 *

-	 */

-	@Override

-	protected void removeListeners() {

-		getTableEditingDomain().removeResourceSetListener(this.resourceSetListener);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsRowManager()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canBeUsedAsRowManager() {

-		boolean answer = true;

-		final Iterator<IAxisManagerForEventList> iter = this.subManagers.iterator();

-		while (iter.hasNext() && answer) {

-			answer = iter.next().canBeUsedAsRowManager();

-		}

-		return answer;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsColumnManager()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canBeUsedAsColumnManager() {

-		boolean answer = true;

-		final Iterator<IAxisManagerForEventList> iter = this.subManagers.iterator();

-		while (iter.hasNext() && answer) {

-			answer = iter.next().canBeUsedAsColumnManager();

-		}

-		return answer;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)

-	 *

-	 * @param elementId

-	 * @return

-	 */

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		boolean canCreateAxisElement = false;

-		for (IAxisManager manager : subManagers) {

-			canCreateAxisElement |= manager.canCreateAxisElement(elementId);

-		}

-		return canCreateAxisElement;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAddAxisCommand(TransactionalEditingDomain, java.util.Collection)

-	 *

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {

-		if (FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(this.tableManager.getTable(), 0)) {

-			return null;

-		}

-		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_AddAxisCommand);

-		for (final IAxisManager current : this.subManagers) {

-			final Command tmp = current.getAddAxisCommand(domain, objectToAdd);

-			if (tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		if (cmd.isEmpty()) {

-			return null;

-		}

-		return cmd;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#initializeManagedObjectList()

-	 *

-	 */

-	@Override

-	protected void initializeManagedObjectList() {

-		// nothing to do

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getComplementaryAddAxisCommand(TransactionalEditingDomain, java.util.Collection)

-	 *

-	 * @param domain

-	 * @param objectToAdd

-	 * @return

-	 */

-	@Override

-	public Command getComplementaryAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {

-		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_AddAxisCommand);

-		for (final IAxisManager current : this.subManagers) {

-			final Command tmp = current.getComplementaryAddAxisCommand(domain, objectToAdd);

-			if (tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		if (cmd.isEmpty()) {

-			return null;

-		}

-		return cmd;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAllowedContents(Object object) {

-		for (final IAxisManager current : this.subManagers) {

-			if (current.isAllowedContents(object)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canMoveAxis()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canMoveAxis() {

-		for (final IAxisManager current : this.subManagers) {

-			if (!current.canMoveAxis() || current.isDynamic()) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#sortAxisByName(boolean, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 *

-	 * @param inverted

-	 * @param configRegistry

-	 */

-	@Override

-	public void sortAxisByName(boolean alphabeticOrder, final IConfigRegistry configRegistry) {

-		if (canMoveAxis()) {

-			final List<IAxis> axis = new ArrayList<IAxis>(getRepresentedContentProvider().getAxis());

-			Collections.sort(axis, new AxisComparator(alphabeticOrder, configRegistry));

-			final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(getRepresentedContentProvider());

-			final AbstractEditCommandRequest request = new SetRequest(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), axis);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getRepresentedContentProvider());

-			final ICommand cmd = provider.getEditCommand(request);

-			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#createPossibleAxisContentProvider(boolean)

-	 *

-	 * @param isRestricted

-	 * @return a contents provider for this axis or <code>null</code> if it is not allowed

-	 */

-	@Override

-	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {

-

-		CompoundFilteredRestrictedContentProvider compoundContentProvider = null;

-		for (final IAxisManager current : this.subManagers) {

-			IRestrictedContentProvider contentProvider = current.createPossibleAxisContentProvider(isRestricted);

-			if (contentProvider != null) {

-				if (compoundContentProvider == null) {

-					compoundContentProvider = new CompoundFilteredRestrictedContentProvider();

-				}

-				compoundContentProvider.add(contentProvider);

-			}

-		}

-		return compoundContentProvider;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getDestroyAxisCommand(TransactionalEditingDomain, java.util.Collection)

-	 *

-	 * @param domain

-	 * @param objectToDestroy

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisCommand(TransactionalEditingDomain domain, Collection<Object> objectToDestroy) {

-		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_DestroyAxisCommand);

-		for (final IAxisManager current : this.subManagers) {

-			final Command tmp = current.getDestroyAxisCommand(domain, objectToDestroy);

-			if (tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		if (cmd.isEmpty()) {

-			return null;

-		}

-		return cmd;

-	}

-

-

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()

-	 *

-	 * @return

-	 *         <code>true</code> if one of the encapsulated manager is a slave

-	 */

-	@Override

-	public boolean isSlave() {

-		for (final IAxisManager manager : this.subManagers) {

-			if (manager.isSlave()) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isDynamic()

-	 *

-	 * @return

-	 *         <code>true</code> if one of the embedded axis manager is dynamic

-	 */

-	@Override

-	public boolean isDynamic() {

-		for (final IAxisManager manager : this.subManagers) {

-			if (manager.isDynamic()) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)

-	 *

-	 * @param objectsToAdd

-	 * @return

-	 */

-	@Override

-	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {

-		for (final IAxisManager current : this.subManagers) {

-			if (current.canDropAxisElement(objectsToAdd)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-

-	/**

-	 *

-	 * @param elementToMove

-	 * @param newIndex

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#moveAxis(java.lang.Object, int)

-	 */

-	@Override

-	public void moveAxis(Object elementToMove, int newIndex) {

-		if (!isDynamic() && elementToMove instanceof IAxis) {

-			TransactionalEditingDomain domain = getTableEditingDomain();

-			final Command command = MoveCommand.create(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), elementToMove, newIndex);

-			domain.getCommandStack().execute(command);

-		}

-	}

-

-	@Override

-	public boolean canEditAxisHeader(final NatEventData axisIndex) {

-		if (canEditAxisHeader()) {

-			return true;

-		} else {

-			return false;

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canEditAxisHeader()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canEditAxisHeader() {

-		for (final IAxisManager current : this.subManagers) {

-			if (!current.canEditAxisHeader()) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getElementAxisName(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis)

-	 *

-	 * @param axis

-	 * @return

-	 */

-	@Override

-	public String getElementAxisName(final IAxis axis) {

-		final AxisManagerRepresentation manager = axis.getManager();

-		for (final IAxisManager man : this.subManagers) {

-			if (man.getAxisManagerRepresentation() == manager) {

-				return man.getElementAxisName(axis);

-			}

-		}

-		if (canEditAxisHeader()) {

-			return null;

-		} else {

-			throw new UnsupportedOperationException();

-		}

-	}

-

-	/**

-	 *

-	 * @param axis

-	 *            an axis

-	 * @return

-	 *         the axis manager managing this axis

-	 */

-	protected IAxisManager getAxisManager(final IAxis axis) {

-		final AxisManagerRepresentation rep = axis.getManager();

-		for (final IAxisManager man : this.subManagers) {

-			if (man.getAxisManagerRepresentation() == rep) {

-				return man;

-			}

-		}

-		return null;// must be impossible

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDestroyAxis(java.lang.Integer)

-	 *

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxis(final Integer axisPosition) {

-		final List<Object> elements = getElements();

-		final Object element = elements.get(axisPosition);

-		if (element instanceof IAxis) {

-			return getAxisManager((IAxis) element).canDestroyAxis(axisPosition);

-		}

-		// not yet managed

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)

-	 *

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public boolean canDestroyAxisElement(Integer axisPosition) {

-		final List<Object> elements = getElements();

-		final Object element = elements.get(axisPosition);

-		if (element instanceof IAxis) {

-			return getAxisManager((IAxis) element).canDestroyAxisElement(axisPosition);

-		} else if (subManagers.size() == 1) {

-			return subManagers.get(0).canDestroyAxisElement(axisPosition);

-		}

-		// not yet managed

-		return false;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)

-	 *

-	 * @param domain

-	 * @param axisPosition

-	 * @return

-	 */

-	@Override

-	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {

-		final List<Object> elements = getElements();

-		final Object element = elements.get(axisPosition);

-		if (element instanceof IAxis) {

-			return getAxisManager((IAxis) element).getDestroyAxisElementCommand(domain, axisPosition);

-		} else if (subManagers.size() == 1) {

-			return subManagers.get(0).getDestroyAxisElementCommand(domain, axisPosition);

-		}

-		// not yet managed

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	@Override

-	public boolean canBeSavedAsConfig() {

-		boolean canBeSavedAsConfig = true;

-		for (IAxisManager manager : subManagers) {

-			canBeSavedAsConfig &= manager.canBeSavedAsConfig();

-		}

-		return canBeSavedAsConfig;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAdapter(java.lang.Class)

-	 *

-	 * @param adapter

-	 * @return

-	 */

-	@Override

-	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {

-		for (final IAxisManager current : this.subManagers) {

-			if (current.getClass() == adapter) {

-				return current;

-			}

-		}

-		return super.getAdapter(adapter);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#isInSortedState()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean isInSortedState() {

-		return this.axisComparator != null;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#setAxisComparator(java.util.Comparator)

-	 *

-	 * @param comp

-	 */

-	@Override

-	public void setAxisComparator(final Comparator<Object> comp) {

-		this.axisComparator = comp;

-		if (this.axisComparator != null) {

-			List<Object> displayedElement = getElements();

-			synchronized (displayedElement) {

-				Collections.sort(displayedElement, comp);

-				getTableManager().refreshNatTable();// useful?

-			}

-		} else {

-			getTableManager().updateAxisContents(getRepresentedContentProvider());

-		}

-	}

-

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAlreadyManaged(java.lang.Object)

-	 *

-	 * @param object

-	 * @return

-	 */

-	@Override

-	public boolean isAlreadyManaged(final Object object) {

-		for (final IAxisManager current : this.subManagers) {

-			if (current.isAlreadyManaged(object)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#getSetNewAxisOrderCommand(java.util.List)

-	 *

-	 * @param newOrder

-	 * @return

-	 */

-	@Override

-	public Command getSetNewAxisOrderCommand(final List<Object> newOrder) {

-		if (canMoveAxis() && !isDynamic()) {

-			return new RecordingCommand(getTableEditingDomain()) {

-

-				@Override

-				protected void doExecute() {

-					final TreeMap<Integer, IAxis> order = new TreeMap<Integer, IAxis>();

-					final AbstractAxisProvider provider = getRepresentedContentProvider();

-					for (int i = 0; i < provider.getAxis().size(); i++) {

-						final IAxis currentAxis = provider.getAxis().get(i);

-						int index = newOrder.indexOf(currentAxis);

-						if (index != -1) {

-							order.put(Integer.valueOf(index), currentAxis);

-						} else {

-							Object resolvedObject = AxisUtils.getRepresentedElement(currentAxis);

-							if (currentAxis instanceof IdAxis) {

-								resolvedObject = getResolvedPath((IdAxis) currentAxis);

-							}

-							index = newOrder.indexOf(resolvedObject);

-							if (index == -1) {

-								throw new IndexOutOfBoundsException("A reordered element can't be resolved"); //$NON-NLS-1$

-							}

-							order.put(Integer.valueOf(index), currentAxis);

-						}

-					}

-

-					final List<IAxis> newValues = new ArrayList<IAxis>();

-					newValues.addAll(order.values());

-					SetCommand.create(getTableEditingDomain(), provider, NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), newValues).execute();

-				}

-			};

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param axisManagerId

-	 *            an axis

-	 * @return

-	 *         the axis manager managing it

-	 */

-	protected IAxisManager findAxisManager(final IAxis axis) {

-		final String axisManagerId = axis.getManager().getAxisManagerId();

-		for (final IAxisManager currentManager : this.subManagers) {

-			if (currentManager.getAxisManagerRepresentation().getAxisManagerId().equals(axisManagerId)) {

-				return currentManager;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 *

-	 * @param idAxis

-	 *            an idAxis

-	 * @return

-	 *         the resolved path or the {@link String} represented by the idAxis if the path can't be resolved

-	 */

-	protected Object getResolvedPath(final IdAxis idAxis) {

-		final String path = idAxis.getElement();

-		final IAxisManager manager = findAxisManager(idAxis);

-		if (manager instanceof IIdAxisManager) {

-			final Object resolvedElement = ((IIdAxisManager) manager).resolvedPath(path);

-			if (resolvedElement != null) {

-				return resolvedElement;

-			}

-		}

-		return path;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#manageSetNotification(org.eclipse.emf.common.notify.Notification)

-	 *

-	 * @param notification

-	 */

-	@Override

-	protected void manageSetNotification(Notification notification) {

-		propagateEvent(notification);

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#manageUnsetNotification(org.eclipse.emf.common.notify.Notification)

-	 *

-	 * @param notification

-	 */

-	@Override

-	protected void manageUnsetNotification(Notification notification) {

-		propagateEvent(notification);

-	}

-

-	@Override

-	protected void manageAddNotification(final Notification notification) {

-		final Object newValue = notification.getNewValue();

-		if (newValue instanceof IAxis && ((IAxis) newValue).eContainer() == getRepresentedContentProvider()) {

-			EventListHelper.addToEventList(eventList, newValue);

-		}

-		propagateEvent(notification);

-	}

-

-

-

-	@Override

-	protected void manageAddManyNotification(final Notification notification) {

-		final Object newValue = notification.getNewValue();

-		if (newValue instanceof Collection<?>) {

-			for (Object current : (Collection<?>) newValue) {

-				if (current instanceof IAxis && ((IAxis) current).eContainer() == getRepresentedContentProvider()) {

-					EventListHelper.addToEventList(eventList, current);

-				}

-			}

-

-		}

-		propagateEvent(notification);

-	}

-

-	@Override

-	protected void manageMoveNotification(final Notification notification) {

-		propagateEvent(notification);

-	}

-

-	@Override

-	protected void manageRemoveNotification(final Notification notification) {

-		final Object oldValue = notification.getOldValue();

-		propagateEvent(notification);

-		if (oldValue instanceof IAxis) {

-			EventListHelper.removeFromEventList(eventList, oldValue);

-		}

-	}

-

-	@Override

-	protected void manageRemoveManyNotification(final Notification notification) {

-		final Object oldValue = notification.getNewValue();

-		propagateEvent(notification);

-		if (oldValue instanceof Collection<?>) {

-			for (Object current : (Collection<?>) oldValue) {

-				if (current instanceof IAxis) {

-					EventListHelper.removeFromEventList(eventList, current);

-				}

-			}

-

-		}

-	}

-

-	/**

-	 * This method propagates the notification to the submanagers in order to update the event list

-	 *

-	 * @param notification

-	 *            a notification

-	 *

-	 */

-	protected void propagateEvent(Notification notification) {

-		for (final IAxisManager current : this.subManagers) {

-			if (current instanceof IAxisManagerForEventList) {

-				((IAxisManagerForEventList) current).manageEvent(notification);

-			}

-		}

-		// must not be done here -> to many refresh are done

-		// getTableManager().refreshNatTable();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#updateAxisContents()

-	 * @deprecated must be removed from the API

-	 */

-	@Override

-	@Deprecated

-	public void updateAxisContents() {

-		// nothing to do

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#treeFillingConfigurationHaveChanged()

-	 *

-	 */

-	@Override

-	public void fillingConfigurationsHaveChanged() {

-		for (final IAxisManager current : this.subManagers) {

-			if (current instanceof IAxisManagerForEventList) {

-				((IAxisManagerForEventList) current).fillingConfigurationsHaveChanged();

-			}

-		}

-		// required

-		getTableManager().refreshNatTable();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * 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:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.manager.axis;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeMap;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.command.MoveCommand;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.ResourceSetListener;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.listener.UpdateTableContentListener;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.messages.Messages;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+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.utils.AxisComparator;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.EventListHelper;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.widgets.providers.CompoundFilteredRestrictedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;
+
+import ca.odell.glazedlists.EventList;
+
+/**
+ * @author VL222926
+ *
+ */
+public class CompositeAxisManagerForEventList extends AbstractAxisManagerForEventList implements IAxisManagerForEventList, ICompositeAxisManager {
+
+	/**
+	 * the id of this manager
+	 */
+	@SuppressWarnings("unused")
+	private static final String MANAGER_ID = "org.eclipse.papyrus.infra.nattable.composite.axis.manager.event.list"; //$NON-NLS-1$
+
+	/**
+	 * the sub managers
+	 */
+	protected List<IAxisManagerForEventList> subManagers;
+
+	/**
+	 * the comparator used to sort the axis
+	 */
+	protected Comparator<Object> axisComparator;
+
+	/**
+	 * the resouce set listener
+	 */
+	private ResourceSetListener resourceSetListener;
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public CompositeAxisManagerForEventList(final EventList<Object> eventList) {
+		setEventList(eventList);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#addListeners()
+	 *
+	 */
+	@Override
+	protected void addListeners() {
+		this.resourceSetListener = new UpdateTableContentListener(getTableManager(), this);
+		if(null != getTableEditingDomain()){
+			getTableEditingDomain().addResourceSetListener(this.resourceSetListener);
+		}
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#setSubAxisManager(java.util.List)
+	 *
+	 * @param managers
+	 */
+	@Override
+	public final void setSubAxisManager(final List<IAxisManager> managers) {
+		throw new UnsupportedOperationException("Use setSubAxisManagers(List<IAxisManagerForEventList> manager)"); //$NON-NLS-1$
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#init(org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager, org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation,
+	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider)
+	 *
+	 * @param manager
+	 * @param rep
+	 * @param provider
+	 */
+	@Override
+	public void init(INattableModelManager manager, AxisManagerRepresentation rep, AbstractAxisProvider provider) {
+		super.init(manager, rep, provider);
+		for (final IAxis current : getRepresentedContentProvider().getAxis()) {
+			if (current instanceof ITreeItemAxis) {
+				EventListHelper.addToEventList(eventList, current);
+			}
+		}
+	}
+
+	/**
+	 * @param subManagers
+	 *            the subManagers to set
+	 */
+	public void setSubManagers(List<IAxisManagerForEventList> subManagers) {
+		this.subManagers = subManagers;
+		for (IAxisManagerForEventList current : subManagers) {
+			current.setEventList(eventList);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		removeListeners();
+		super.dispose();
+		for (final IAxisManager current : this.subManagers) {
+			current.dispose();
+		}
+		this.subManagers.clear();
+
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#removeListeners()
+	 *
+	 */
+	@Override
+	protected void removeListeners() {
+		if(null != getTableEditingDomain()){
+			getTableEditingDomain().removeResourceSetListener(this.resourceSetListener);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsRowManager()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canBeUsedAsRowManager() {
+		boolean answer = true;
+		final Iterator<IAxisManagerForEventList> iter = this.subManagers.iterator();
+		while (iter.hasNext() && answer) {
+			answer = iter.next().canBeUsedAsRowManager();
+		}
+		return answer;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canBeUsedAsColumnManager()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canBeUsedAsColumnManager() {
+		boolean answer = true;
+		final Iterator<IAxisManagerForEventList> iter = this.subManagers.iterator();
+		while (iter.hasNext() && answer) {
+			answer = iter.next().canBeUsedAsColumnManager();
+		}
+		return answer;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canCreateAxisElement(java.lang.String)
+	 *
+	 * @param elementId
+	 * @return
+	 */
+	@Override
+	public boolean canCreateAxisElement(String elementId) {
+		boolean canCreateAxisElement = false;
+		for (IAxisManager manager : subManagers) {
+			canCreateAxisElement |= manager.canCreateAxisElement(elementId);
+		}
+		return canCreateAxisElement;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAddAxisCommand(TransactionalEditingDomain, java.util.Collection)
+	 *
+	 * @param domain
+	 * @param objectToAdd
+	 * @return
+	 */
+	@Override
+	public Command getAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {
+		if (FillingConfigurationUtils.hasTreeFillingConfigurationForDepth(this.tableManager.getTable(), 0)) {
+			return null;
+		}
+		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_AddAxisCommand);
+		for (final IAxisManager current : this.subManagers) {
+			final Command tmp = current.getAddAxisCommand(domain, objectToAdd);
+			if (tmp != null) {
+				cmd.append(tmp);
+			}
+		}
+		if (cmd.isEmpty()) {
+			return null;
+		}
+		return cmd;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#initializeManagedObjectList()
+	 *
+	 */
+	@Override
+	protected void initializeManagedObjectList() {
+		// nothing to do
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getComplementaryAddAxisCommand(TransactionalEditingDomain, java.util.Collection)
+	 *
+	 * @param domain
+	 * @param objectToAdd
+	 * @return
+	 */
+	@Override
+	public Command getComplementaryAddAxisCommand(final TransactionalEditingDomain domain, final Collection<Object> objectToAdd) {
+		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_AddAxisCommand);
+		for (final IAxisManager current : this.subManagers) {
+			final Command tmp = current.getComplementaryAddAxisCommand(domain, objectToAdd);
+			if (tmp != null) {
+				cmd.append(tmp);
+			}
+		}
+		if (cmd.isEmpty()) {
+			return null;
+		}
+		return cmd;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAllowedContents(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public boolean isAllowedContents(Object object) {
+		for (final IAxisManager current : this.subManagers) {
+			if (current.isAllowedContents(object)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canMoveAxis()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canMoveAxis() {
+		for (final IAxisManager current : this.subManagers) {
+			if (!current.canMoveAxis() || current.isDynamic()) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#sortAxisByName(boolean, org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)
+	 *
+	 * @param inverted
+	 * @param configRegistry
+	 */
+	@Override
+	public void sortAxisByName(boolean alphabeticOrder, final IConfigRegistry configRegistry) {
+		if (canMoveAxis()) {
+			final List<IAxis> axis = new ArrayList<IAxis>(getRepresentedContentProvider().getAxis());
+			Collections.sort(axis, new AxisComparator(alphabeticOrder, configRegistry));
+			final TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(getRepresentedContentProvider());
+			final AbstractEditCommandRequest request = new SetRequest(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), axis);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(getRepresentedContentProvider());
+			final ICommand cmd = provider.getEditCommand(request);
+			domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#createPossibleAxisContentProvider(boolean)
+	 *
+	 * @param isRestricted
+	 * @return a contents provider for this axis or <code>null</code> if it is not allowed
+	 */
+	@Override
+	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {
+
+		CompoundFilteredRestrictedContentProvider compoundContentProvider = null;
+		for (final IAxisManager current : this.subManagers) {
+			IRestrictedContentProvider contentProvider = current.createPossibleAxisContentProvider(isRestricted);
+			if (contentProvider != null) {
+				if (compoundContentProvider == null) {
+					compoundContentProvider = new CompoundFilteredRestrictedContentProvider();
+				}
+				compoundContentProvider.add(contentProvider);
+			}
+		}
+		return compoundContentProvider;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getDestroyAxisCommand(TransactionalEditingDomain, java.util.Collection)
+	 *
+	 * @param domain
+	 * @param objectToDestroy
+	 * @return
+	 */
+	@Override
+	public Command getDestroyAxisCommand(TransactionalEditingDomain domain, Collection<Object> objectToDestroy) {
+		final CompoundCommand cmd = new CompoundCommand(Messages.CompositeAxisManager_DestroyAxisCommand);
+		for (final IAxisManager current : this.subManagers) {
+			final Command tmp = current.getDestroyAxisCommand(domain, objectToDestroy);
+			if (tmp != null) {
+				cmd.append(tmp);
+			}
+		}
+		if (cmd.isEmpty()) {
+			return null;
+		}
+		return cmd;
+	}
+
+
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isSlave()
+	 *
+	 * @return
+	 *         <code>true</code> if one of the encapsulated manager is a slave
+	 */
+	@Override
+	public boolean isSlave() {
+		for (final IAxisManager manager : this.subManagers) {
+			if (manager.isSlave()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#isDynamic()
+	 *
+	 * @return
+	 *         <code>true</code> if one of the embedded axis manager is dynamic
+	 */
+	@Override
+	public boolean isDynamic() {
+		for (final IAxisManager manager : this.subManagers) {
+			if (manager.isDynamic()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDropAxisElement(java.util.Collection)
+	 *
+	 * @param objectsToAdd
+	 * @return
+	 */
+	@Override
+	public boolean canDropAxisElement(Collection<Object> objectsToAdd) {
+		for (final IAxisManager current : this.subManagers) {
+			if (current.canDropAxisElement(objectsToAdd)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 *
+	 * @param elementToMove
+	 * @param newIndex
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#moveAxis(java.lang.Object, int)
+	 */
+	@Override
+	public void moveAxis(Object elementToMove, int newIndex) {
+		if (!isDynamic() && elementToMove instanceof IAxis) {
+			TransactionalEditingDomain domain = getTableEditingDomain();
+			final Command command = MoveCommand.create(domain, getRepresentedContentProvider(), NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), elementToMove, newIndex);
+			domain.getCommandStack().execute(command);
+		}
+	}
+
+	@Override
+	public boolean canEditAxisHeader(final NatEventData axisIndex) {
+		if (canEditAxisHeader()) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canEditAxisHeader()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canEditAxisHeader() {
+		for (final IAxisManager current : this.subManagers) {
+			if (!current.canEditAxisHeader()) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getElementAxisName(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis)
+	 *
+	 * @param axis
+	 * @return
+	 */
+	@Override
+	public String getElementAxisName(final IAxis axis) {
+		final AxisManagerRepresentation manager = axis.getManager();
+		for (final IAxisManager man : this.subManagers) {
+			if (man.getAxisManagerRepresentation() == manager) {
+				return man.getElementAxisName(axis);
+			}
+		}
+		if (canEditAxisHeader()) {
+			return null;
+		} else {
+			throw new UnsupportedOperationException();
+		}
+	}
+
+	/**
+	 *
+	 * @param axis
+	 *            an axis
+	 * @return
+	 *         the axis manager managing this axis
+	 */
+	protected IAxisManager getAxisManager(final IAxis axis) {
+		final AxisManagerRepresentation rep = axis.getManager();
+		for (final IAxisManager man : this.subManagers) {
+			if (man.getAxisManagerRepresentation() == rep) {
+				return man;
+			}
+		}
+		return null;// must be impossible
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canDestroyAxis(java.lang.Integer)
+	 *
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public boolean canDestroyAxis(final Integer axisPosition) {
+		final List<Object> elements = getElements();
+		final Object element = elements.get(axisPosition);
+		if (element instanceof IAxis) {
+			return getAxisManager((IAxis) element).canDestroyAxis(axisPosition);
+		}
+		// not yet managed
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canDestroyAxisElement(java.lang.Integer)
+	 *
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public boolean canDestroyAxisElement(Integer axisPosition) {
+		final List<Object> elements = getElements();
+		final Object element = elements.get(axisPosition);
+		if (element instanceof IAxis) {
+			return getAxisManager((IAxis) element).canDestroyAxisElement(axisPosition);
+		} else if (subManagers.size() == 1) {
+			return subManagers.get(0).canDestroyAxisElement(axisPosition);
+		}
+		// not yet managed
+		return false;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getDestroyAxisElementCommand(TransactionalEditingDomain, java.lang.Integer)
+	 *
+	 * @param domain
+	 * @param axisPosition
+	 * @return
+	 */
+	@Override
+	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {
+		final List<Object> elements = getElements();
+		final Object element = elements.get(axisPosition);
+		if (element instanceof IAxis) {
+			return getAxisManager((IAxis) element).getDestroyAxisElementCommand(domain, axisPosition);
+		} else if (subManagers.size() == 1) {
+			return subManagers.get(0).getDestroyAxisElementCommand(domain, axisPosition);
+		}
+		// not yet managed
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	@Override
+	public boolean canBeSavedAsConfig() {
+		boolean canBeSavedAsConfig = true;
+		for (IAxisManager manager : subManagers) {
+			canBeSavedAsConfig &= manager.canBeSavedAsConfig();
+		}
+		return canBeSavedAsConfig;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getAdapter(java.lang.Class)
+	 *
+	 * @param adapter
+	 * @return
+	 */
+	@Override
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+		for (final IAxisManager current : this.subManagers) {
+			if (current.getClass() == adapter) {
+				return current;
+			}
+		}
+		return super.getAdapter(adapter);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#isInSortedState()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean isInSortedState() {
+		return this.axisComparator != null;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#setAxisComparator(java.util.Comparator)
+	 *
+	 * @param comp
+	 */
+	@Override
+	public void setAxisComparator(final Comparator<Object> comp) {
+		this.axisComparator = comp;
+		if (this.axisComparator != null) {
+			List<Object> displayedElement = getElements();
+			synchronized (displayedElement) {
+				Collections.sort(displayedElement, comp);
+				getTableManager().refreshNatTable();// useful?
+			}
+		} else {
+			getTableManager().updateAxisContents(getRepresentedContentProvider());
+		}
+	}
+
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#isAlreadyManaged(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public boolean isAlreadyManaged(final Object object) {
+		for (final IAxisManager current : this.subManagers) {
+			if (current.isAlreadyManaged(object)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#getSetNewAxisOrderCommand(java.util.List)
+	 *
+	 * @param newOrder
+	 * @return
+	 */
+	@Override
+	public Command getSetNewAxisOrderCommand(final List<Object> newOrder) {
+		if (canMoveAxis() && !isDynamic()) {
+			return new RecordingCommand(getTableEditingDomain()) {
+
+				@Override
+				protected void doExecute() {
+					final TreeMap<Integer, IAxis> order = new TreeMap<Integer, IAxis>();
+					final AbstractAxisProvider provider = getRepresentedContentProvider();
+					for (int i = 0; i < provider.getAxis().size(); i++) {
+						final IAxis currentAxis = provider.getAxis().get(i);
+						int index = newOrder.indexOf(currentAxis);
+						if (index != -1) {
+							order.put(Integer.valueOf(index), currentAxis);
+						} else {
+							Object resolvedObject = AxisUtils.getRepresentedElement(currentAxis);
+							if (currentAxis instanceof IdAxis) {
+								resolvedObject = getResolvedPath((IdAxis) currentAxis);
+							}
+							index = newOrder.indexOf(resolvedObject);
+							if (index == -1) {
+								throw new IndexOutOfBoundsException("A reordered element can't be resolved"); //$NON-NLS-1$
+							}
+							order.put(Integer.valueOf(index), currentAxis);
+						}
+					}
+
+					final List<IAxis> newValues = new ArrayList<IAxis>();
+					newValues.addAll(order.values());
+					SetCommand.create(getTableEditingDomain(), provider, NattableaxisproviderPackage.eINSTANCE.getAxisProvider_Axis(), newValues).execute();
+				}
+			};
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param axisManagerId
+	 *            an axis
+	 * @return
+	 *         the axis manager managing it
+	 */
+	protected IAxisManager findAxisManager(final IAxis axis) {
+		final String axisManagerId = axis.getManager().getAxisManagerId();
+		for (final IAxisManager currentManager : this.subManagers) {
+			if (currentManager.getAxisManagerRepresentation().getAxisManagerId().equals(axisManagerId)) {
+				return currentManager;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 *
+	 * @param idAxis
+	 *            an idAxis
+	 * @return
+	 *         the resolved path or the {@link String} represented by the idAxis if the path can't be resolved
+	 */
+	protected Object getResolvedPath(final IdAxis idAxis) {
+		final String path = idAxis.getElement();
+		final IAxisManager manager = findAxisManager(idAxis);
+		if (manager instanceof IIdAxisManager) {
+			final Object resolvedElement = ((IIdAxisManager) manager).resolvedPath(path);
+			if (resolvedElement != null) {
+				return resolvedElement;
+			}
+		}
+		return path;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#manageSetNotification(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void manageSetNotification(Notification notification) {
+		propagateEvent(notification);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManagerForEventList#manageUnsetNotification(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void manageUnsetNotification(Notification notification) {
+		propagateEvent(notification);
+	}
+
+	@Override
+	protected void manageAddNotification(final Notification notification) {
+		final Object newValue = notification.getNewValue();
+		if (newValue instanceof IAxis && ((IAxis) newValue).eContainer() == getRepresentedContentProvider()) {
+			EventListHelper.addToEventList(eventList, newValue);
+		}
+		propagateEvent(notification);
+	}
+
+
+
+	@Override
+	protected void manageAddManyNotification(final Notification notification) {
+		final Object newValue = notification.getNewValue();
+		if (newValue instanceof Collection<?>) {
+			for (Object current : (Collection<?>) newValue) {
+				if (current instanceof IAxis && ((IAxis) current).eContainer() == getRepresentedContentProvider()) {
+					EventListHelper.addToEventList(eventList, current);
+				}
+			}
+
+		}
+		propagateEvent(notification);
+	}
+
+	@Override
+	protected void manageMoveNotification(final Notification notification) {
+		propagateEvent(notification);
+	}
+
+	@Override
+	protected void manageRemoveNotification(final Notification notification) {
+		final Object oldValue = notification.getOldValue();
+		propagateEvent(notification);
+		if (oldValue instanceof IAxis) {
+			EventListHelper.removeFromEventList(eventList, oldValue);
+		}
+	}
+
+	@Override
+	protected void manageRemoveManyNotification(final Notification notification) {
+		final Object oldValue = notification.getNewValue();
+		propagateEvent(notification);
+		if (oldValue instanceof Collection<?>) {
+			for (Object current : (Collection<?>) oldValue) {
+				if (current instanceof IAxis) {
+					EventListHelper.removeFromEventList(eventList, current);
+				}
+			}
+
+		}
+	}
+
+	/**
+	 * This method propagates the notification to the submanagers in order to update the event list
+	 *
+	 * @param notification
+	 *            a notification
+	 *
+	 */
+	protected void propagateEvent(Notification notification) {
+		for (final IAxisManager current : this.subManagers) {
+			if (current instanceof IAxisManagerForEventList) {
+				((IAxisManagerForEventList) current).manageEvent(notification);
+			}
+		}
+		// must not be done here -> to many refresh are done
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager#updateAxisContents()
+	 * @deprecated must be removed from the API
+	 */
+	@Override
+	@Deprecated
+	public void updateAxisContents() {
+		// nothing to do
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#treeFillingConfigurationHaveChanged()
+	 *
+	 */
+	@Override
+	public void fillingConfigurationsHaveChanged() {
+		for (final IAxisManager current : this.subManagers) {
+			if (current instanceof IAxisManagerForEventList) {
+				((IAxisManagerForEventList) current).fillingConfigurationsHaveChanged();
+			}
+		}
+		// required
+		getTableManager().refreshNatTable();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java
index 6ed642bdf65..81d74423944 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeTreeAxisManagerForEventList.java
@@ -1,273 +1,276 @@
-/*****************************************************************************

- * Copyright (c) 2014 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.manager.axis;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.transaction.RollbackException;

-import org.eclipse.nebula.widgets.nattable.sort.ISortModel;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.EventListHelper;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;

-

-import ca.odell.glazedlists.EventList;

-

-/**

- *

- * @author VL222926

- *         Composite Axis manager for hierarchic table

- */

-public class CompositeTreeAxisManagerForEventList extends CompositeAxisManagerForEventList implements ITreeItemAxisManagerForEventList {

-

-	/**

-	 * Constructor.

-	 *

-	 * @param eventList

-	 */

-	public CompositeTreeAxisManagerForEventList(EventList<Object> eventList) {

-		super(eventList);

-	}

-

-	/**

-	 * the id of this manager

-	 */

-	@SuppressWarnings("unused")

-	private static final String MANAGER_ID = "org.eclipse.papyrus.infra.nattable.composite.tree.axis.manager.event.list"; //$NON-NLS-1$

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManagerForEventList#setSubManagers(java.util.List)

-	 *

-	 * @param subManagers

-	 */

-	@Override

-	public void setSubManagers(List<IAxisManagerForEventList> subManagers) {

-		super.setSubManagers(subManagers);

-		fillListWithRoots();

-	}

-

-	/**

-	 * @param notification

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#manageEvent(Notification)

-	 */

-	@Override

-	public void manageEvent(Notification notification) {

-		super.manageEvent(notification);

-		// must not be done here -> to many call to refresh

-		// getTableManager().refreshNatTable();

-	}

-

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#fillListWithChildren(ca.odell.glazedlists.EventList, org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis)

-	 *

-	 * @param listToModify

-	 * @param axis

-	 */

-	@Override

-	public void fillListWithChildren(final ITreeItemAxis axis) {

-		for (final IAxisManager current : this.subManagers) {

-			if (current instanceof ITreeItemAxisManagerForEventList) {

-				((ITreeItemAxisManagerForEventList) current).fillListWithChildren(axis);

-			}

-		}

-		getTableManager().refreshNatTable();

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#isAllowedContents(java.lang.Object, Object, TreeFillingConfiguration, int)

-	 *

-	 * @param objectToTest

-	 * @param depth

-	 * @return

-	 */

-	@Override

-	public boolean isAllowedContents(Object objectToTest, Object semanticParent, TreeFillingConfiguration conf, int depth) {

-		if (isInitialConfiguration(conf)) {

-			for (final IAxisManager current : this.subManagers) {

-				if (current instanceof ITreeItemAxisManagerForEventList) {

-					if (((ITreeItemAxisManagerForEventList) current).isAllowedContents(objectToTest, semanticParent, conf, depth)) {

-						return true;

-					}

-				}

-			}

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * 

-	 * @param conf

-	 *            a tree filling configuration

-	 * @return

-	 *         <code>true</code> if the tree filling configuration comes from the initial table configuration

-	 */

-	private final boolean isInitialConfiguration(TreeFillingConfiguration conf) {

-		if (EMFHelper.isReadOnly(conf)) {

-			return true;

-		}

-		TableHeaderAxisConfiguration axisConf = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(getTableManager().getTable());

-		for (IAxisConfiguration curr : axisConf.getOwnedAxisConfigurations()) {

-			if (curr instanceof TreeFillingConfiguration) {

-				TreeFillingConfiguration treeConf = (TreeFillingConfiguration) curr;

-				Object representedElement = treeConf.getAxisUsedAsAxisProvider().getElement();

-				return representedElement.equals(conf.getAxisUsedAsAxisProvider().getElement());

-			}

-		}

-		return false;

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#compare(org.eclipse.nebula.widgets.nattable.sort.ISortModel, int, org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis,

-	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)

-	 *

-	 * @param sortModel

-	 * @param depth

-	 * @param axis1

-	 * @param axis2

-	 * @return

-	 */

-	@Override

-	public int compare(ISortModel sortModel, int depth, ITreeItemAxis axis1, ITreeItemAxis axis2) {

-		final AxisManagerRepresentation manager1 = axis1.getManager();

-		final AxisManagerRepresentation manager2 = axis2.getManager();

-		if (manager1 == null || manager2 == null) {

-			return 0;

-		}

-		if (manager1 == manager2) {

-			for (final IAxisManagerForEventList current : this.subManagers) {

-				if (current.getAxisManagerRepresentation() == manager1) {

-					return ((ITreeItemAxisManagerForEventList) current).compare(sortModel, depth, axis1, axis2);

-				}

-			}

-		}

-		return 0;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#setExpanded(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis, java.util.List, boolean)

-	 *

-	 * @param element

-	 * @param path

-	 * @param expanded

-	 */

-	@Override

-	public void setExpanded(ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded) {

-		for (final IAxisManager current : this.subManagers) {

-			if (element.getManager() == current.getAxisManagerRepresentation() && current instanceof ITreeItemAxisManagerForEventList) {

-				((ITreeItemAxisManagerForEventList) current).setExpanded(element, path, expanded);

-			}

-		}

-

-		// we are modifying the model, so we need to do the expand is a command, but this action must not be done in the stack (and must not be available in the history)

-		final SetCommand cmd = new SetCommand(getTableEditingDomain(), element, NattableaxisPackage.eINSTANCE.getITreeItemAxis_Expanded(), expanded);

-		try {

-			GMFUnsafe.write(getTableEditingDomain(), new Runnable() {

-

-				@Override

-				public void run() {

-					cmd.execute();

-				}

-			});

-		} catch (InterruptedException e) {

-			Activator.log.error(e);

-		} catch (RollbackException e) {

-			Activator.log.error(e);

-		}

-		getTableManager().refreshNatTable();

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#fillRoot()

-	 *

-	 */

-	@Override

-	public void fillListWithRoots() {

-		// 1. we fill the list with root elements saved in the table model

-		for (final IAxis current : getRepresentedContentProvider().getAxis()) {

-			if (current instanceof ITreeItemAxis) {

-				EventListHelper.addToEventList(this.eventList, current);

-			}

-		}

-

-		// 2. we update/create the root element calling the submanager

-		for (final IAxisManager current : this.subManagers) {

-			if (current instanceof ITreeItemAxisManagerForEventList) {

-				((ITreeItemAxisManagerForEventList) current).fillListWithRoots();

-			}

-		}

-		// required

-		getTableManager().refreshNatTable();

-	}

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#managedHideShowCategoriesForDepth(java.util.List, java.util.List)

-	 *

-	 * @param toHide

-	 * @param toShow

-	 */

-	@Override

-	public void managedHideShowCategoriesForDepth(List<Integer> toHide, List<Integer> toShow) {

-		for (final IAxisManager current : this.subManagers) {

-			if (current instanceof ITreeItemAxisManagerForEventList) {

-				((ITreeItemAxisManagerForEventList) current).managedHideShowCategoriesForDepth(toHide, toShow);

-			}

-		}

-		// required

-		getTableManager().refreshNatTable();

-	}

-	

-	/**

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManagerForEventList#fillingConfigurationsHaveChanged()

-	 *

-	 */

-	@Override

-	public void fillingConfigurationsHaveChanged() {

-		super.fillingConfigurationsHaveChanged();

-		

-		//fix for the bug 467723: [Tree Table] changing categories when categories are hidden empty the table

-		//we reset the visibility status for all depths to true

-		List<Integer> depths = new ArrayList<Integer>();

-		for(int i=0;i<=FillingConfigurationUtils.getMaxDepthForTree(getTableManager().getTable());i++){

-			depths.add(Integer.valueOf(i));

-		}

-		((TreeNattableModelManager) getTableManager()).hideShowCategories(null, depths);

-		List<Integer> hiddenDepth = StyleUtils.getHiddenDepths(getTableManager());

-		if (hiddenDepth.size() > 0) {

-			//we reset the hidden depth (allow to expand hidden category too (fix the bug 

-			((TreeNattableModelManager) getTableManager()).hideShowCategories(hiddenDepth, null);

-		}

-		// required

-		getTableManager().refreshNatTable();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 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.manager.axis;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.nebula.widgets.nattable.sort.ISortModel;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.EventListHelper;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+
+import ca.odell.glazedlists.EventList;
+
+/**
+ *
+ * @author VL222926
+ *         Composite Axis manager for hierarchic table
+ */
+public class CompositeTreeAxisManagerForEventList extends CompositeAxisManagerForEventList implements ITreeItemAxisManagerForEventList {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param eventList
+	 */
+	public CompositeTreeAxisManagerForEventList(EventList<Object> eventList) {
+		super(eventList);
+	}
+
+	/**
+	 * the id of this manager
+	 */
+	@SuppressWarnings("unused")
+	private static final String MANAGER_ID = "org.eclipse.papyrus.infra.nattable.composite.tree.axis.manager.event.list"; //$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManagerForEventList#setSubManagers(java.util.List)
+	 *
+	 * @param subManagers
+	 */
+	@Override
+	public void setSubManagers(List<IAxisManagerForEventList> subManagers) {
+		super.setSubManagers(subManagers);
+		fillListWithRoots();
+	}
+
+	/**
+	 * @param notification
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#manageEvent(Notification)
+	 */
+	@Override
+	public void manageEvent(Notification notification) {
+		super.manageEvent(notification);
+		// must not be done here -> to many call to refresh
+	}
+
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList#fillListWithChildren(ca.odell.glazedlists.EventList, org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis)
+	 *
+	 * @param listToModify
+	 * @param axis
+	 */
+	@Override
+	public void fillListWithChildren(final ITreeItemAxis axis) {
+		for (final IAxisManager current : this.subManagers) {
+			if (current instanceof ITreeItemAxisManagerForEventList) {
+				((ITreeItemAxisManagerForEventList) current).fillListWithChildren(axis);
+			}
+		}
+		getTableManager().refreshNatTable();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#isAllowedContents(java.lang.Object, Object, TreeFillingConfiguration, int)
+	 *
+	 * @param objectToTest
+	 * @param depth
+	 * @return
+	 */
+	@Override
+	public boolean isAllowedContents(Object objectToTest, Object semanticParent, TreeFillingConfiguration conf, int depth) {
+		if (isInitialConfiguration(conf)) {
+			for (final IAxisManager current : this.subManagers) {
+				if (current instanceof ITreeItemAxisManagerForEventList) {
+					if (((ITreeItemAxisManagerForEventList) current).isAllowedContents(objectToTest, semanticParent, conf, depth)) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * 
+	 * @param conf
+	 *            a tree filling configuration
+	 * @return
+	 *         <code>true</code> if the tree filling configuration comes from the initial table configuration
+	 */
+	private final boolean isInitialConfiguration(TreeFillingConfiguration conf) {
+		if (EMFHelper.isReadOnly(conf)) {
+			return true;
+		}
+		TableHeaderAxisConfiguration axisConf = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(getTableManager().getTable());
+		for (IAxisConfiguration curr : axisConf.getOwnedAxisConfigurations()) {
+			if (curr instanceof TreeFillingConfiguration) {
+				TreeFillingConfiguration treeConf = (TreeFillingConfiguration) curr;
+				Object representedElement = treeConf.getAxisUsedAsAxisProvider().getElement();
+				return representedElement.equals(conf.getAxisUsedAsAxisProvider().getElement());
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#compare(org.eclipse.nebula.widgets.nattable.sort.ISortModel, int, org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis,
+	 *      org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
+	 *
+	 * @param sortModel
+	 * @param depth
+	 * @param axis1
+	 * @param axis2
+	 * @return
+	 */
+	@Override
+	public int compare(ISortModel sortModel, int depth, ITreeItemAxis axis1, ITreeItemAxis axis2) {
+		final AxisManagerRepresentation manager1 = axis1.getManager();
+		final AxisManagerRepresentation manager2 = axis2.getManager();
+		if (manager1 == null || manager2 == null) {
+			return 0;
+		}
+		if (manager1 == manager2) {
+			for (final IAxisManagerForEventList current : this.subManagers) {
+				if (current.getAxisManagerRepresentation() == manager1) {
+					return ((ITreeItemAxisManagerForEventList) current).compare(sortModel, depth, axis1, axis2);
+				}
+			}
+		}
+		return 0;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#setExpanded(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis, java.util.List, boolean)
+	 *
+	 * @param element
+	 * @param path
+	 * @param expanded
+	 */
+	@Override
+	public void setExpanded(ITreeItemAxis element, List<ITreeItemAxis> path, boolean expanded) {
+		for (final IAxisManager current : this.subManagers) {
+			if (element.getManager() == current.getAxisManagerRepresentation() && current instanceof ITreeItemAxisManagerForEventList) {
+				((ITreeItemAxisManagerForEventList) current).setExpanded(element, path, expanded);
+			}
+		}
+
+		// we are modifying the model, so we need to do the expand is a command, but this action must not be done in the stack (and must not be available in the history)
+		final SetCommand cmd = new SetCommand(getTableEditingDomain(), element, NattableaxisPackage.eINSTANCE.getITreeItemAxis_Expanded(), expanded);
+		try {
+			if(null != getTableEditingDomain()){
+				GMFUnsafe.write(getTableEditingDomain(), new Runnable() {
+	
+					@Override
+					public void run() {
+						cmd.execute();
+					}
+				});
+			}else{
+				cmd.execute();
+			}
+		} catch (InterruptedException e) {
+			Activator.log.error(e);
+		} catch (RollbackException e) {
+			Activator.log.error(e);
+		}
+		getTableManager().refreshNatTable();
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#fillRoot()
+	 *
+	 */
+	@Override
+	public void fillListWithRoots() {
+		// 1. we fill the list with root elements saved in the table model
+		for (final IAxis current : getRepresentedContentProvider().getAxis()) {
+			if (current instanceof ITreeItemAxis) {
+				EventListHelper.addToEventList(this.eventList, current);
+			}
+		}
+
+		// 2. we update/create the root element calling the submanager
+		for (final IAxisManager current : this.subManagers) {
+			if (current instanceof ITreeItemAxisManagerForEventList) {
+				((ITreeItemAxisManagerForEventList) current).fillListWithRoots();
+			}
+		}
+		// required
+		getTableManager().refreshNatTable();
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList#managedHideShowCategoriesForDepth(java.util.List, java.util.List)
+	 *
+	 * @param toHide
+	 * @param toShow
+	 */
+	@Override
+	public void managedHideShowCategoriesForDepth(List<Integer> toHide, List<Integer> toShow) {
+		for (final IAxisManager current : this.subManagers) {
+			if (current instanceof ITreeItemAxisManagerForEventList) {
+				((ITreeItemAxisManagerForEventList) current).managedHideShowCategoriesForDepth(toHide, toShow);
+			}
+		}
+		// required
+		getTableManager().refreshNatTable();
+	}
+	
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManagerForEventList#fillingConfigurationsHaveChanged()
+	 *
+	 */
+	@Override
+	public void fillingConfigurationsHaveChanged() {
+		super.fillingConfigurationsHaveChanged();
+		
+		//fix for the bug 467723: [Tree Table] changing categories when categories are hidden empty the table
+		//we reset the visibility status for all depths to true
+		List<Integer> depths = new ArrayList<Integer>();
+		for(int i=0;i<=FillingConfigurationUtils.getMaxDepthForTree(getTableManager().getTable());i++){
+			depths.add(Integer.valueOf(i));
+		}
+		((TreeNattableModelManager) getTableManager()).hideShowCategories(null, depths);
+		List<Integer> hiddenDepth = StyleUtils.getHiddenDepths(getTableManager());
+		if (hiddenDepth.size() > 0) {
+			//we reset the hidden depth (allow to expand hidden category too (fix the bug 
+			((TreeNattableModelManager) getTableManager()).hideShowCategories(hiddenDepth, null);
+		}
+		// required
+		getTableManager().refreshNatTable();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
index 156fcf7547f..f06454be320 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
@@ -1,1846 +1,1829 @@
-/*****************************************************************************

- * Copyright (c) 2012 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.manager.table;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.EventObject;

-import java.util.Iterator;

-import java.util.List;

-import java.util.concurrent.atomic.AtomicBoolean;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.core.runtime.jobs.IJobChangeEvent;

-import org.eclipse.core.runtime.jobs.Job;

-import org.eclipse.core.runtime.jobs.JobChangeAdapter;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.impl.AdapterImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.transaction.NotificationFilter;

-import org.eclipse.emf.transaction.ResourceSetChangeEvent;

-import org.eclipse.emf.transaction.ResourceSetListener;

-import org.eclipse.emf.transaction.RollbackException;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.preference.PreferenceStore;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ViewerComparator;

-import org.eclipse.jface.window.Window;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.command.VisualRefreshCommand;

-import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;

-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

-import org.eclipse.nebula.widgets.nattable.filterrow.IFilterStrategy;

-import org.eclipse.nebula.widgets.nattable.layer.ILayerListener;

-import org.eclipse.nebula.widgets.nattable.layer.event.ILayerEvent;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.command.CommandIds;

-import org.eclipse.papyrus.infra.nattable.dialog.DisplayedAxisSelectorDialog;

-import org.eclipse.papyrus.infra.nattable.filter.PapyrusFilterStrategy;

-import org.eclipse.papyrus.infra.nattable.manager.axis.AxisManagerFactory;

-import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;

-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.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

-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.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;

-import org.eclipse.papyrus.infra.nattable.selection.ISelectionExtractor;

-import org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.utils.CellMapKey;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.nattable.utils.StringComparator;

-import org.eclipse.papyrus.infra.nattable.utils.TableHelper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.tools.util.EclipseCommandUtils;

-import org.eclipse.papyrus.infra.widgets.providers.FlattenableRestrictedFilteredContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

-import org.eclipse.swt.events.FocusEvent;

-import org.eclipse.swt.events.FocusListener;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IWorkbenchPartSite;

-import org.eclipse.ui.commands.ICommandService;

-

-import com.google.common.collect.BiMap;

-import com.google.common.collect.HashBiMap;

-

-import ca.odell.glazedlists.EventList;

-import ca.odell.glazedlists.FilterList;

-import ca.odell.glazedlists.GlazedLists;

-import ca.odell.glazedlists.event.ListEvent;

-import ca.odell.glazedlists.event.ListEventListener;

-

-/**

- * All the code concerning tree table is in the subclass {@link TreeNattableModelManager}

- *

- *

- */

-public class NattableModelManager extends AbstractNattableWidgetManager implements INattableModelManager {

-

-	/**

-	 * the column manager

-	 */

-	private ICompositeAxisManager columnManager;

-

-	/**

-	 * the line manager

-	 */

-	private ICompositeAxisManager rowManager;

-

-	/**

-	 * the model of the table on which we are working

-	 */

-	private List<Object> verticalElements;

-

-	private List<Object> horizontalElements;

-

-	protected FilterList<Object> verticalFilterList;

-

-	protected FilterList<Object> horizontalFilterList;

-

-	protected EventList<Object> basicVerticalList;

-

-	protected EventList<Object> basicHorizontalList;

-

-	private Adapter invertAxisListener;

-

-	private AbstractAxisProvider rowProvider;

-

-	private AbstractAxisProvider columnProvider;

-

-	/**

-	 * this listener listen the stack events and refresh nattable

-	 */

-	private CommandStackListener refreshListener;

-

-	/**

-	 * the focus listener

-	 */

-	private FocusListener focusListener;

-

-	/**

-	 * the resourceSet listener

-	 */

-	private ResourceSetListener resourceSetListener;

-

-	/**

-	 * layerListener to update the toggles

-	 */

-	private ILayerListener layerListener;

-

-

-	private Adapter changeAxisProvider;

-

-	private AdapterImpl changeAxisProviderHistory;

-

-

-	/**

-	 * the listener on the table cells

-	 */

-	private Adapter tableCellsListener;

-

-	private BiMap<CellMapKey, Cell> cellsMap;

-

-	/**

-	 * the local preference store for the table

-	 */

-	private PreferenceStore localPreferenceStore;

-

-

-	// fields used for refresh

-	private Runnable refreshRunnable;

-

-	/** Flag to avoid reentrant call to refresh. */

-	private AtomicBoolean isRefreshing = new AtomicBoolean(false);

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param rawModel

-	 *

-	 *            the model of the managed table

-	 */

-	public NattableModelManager(final Table rawModel) {

-		this(rawModel, new ObjectsSelectionExtractor());

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 *

-	 * @param rawModel

-	 *            the table model

-	 * @param selectionExtractor

-	 *            the selection extrator

-	 */

-	public NattableModelManager(final Table rawModel, final ISelectionExtractor selectionExtractor) {

-		super(rawModel, selectionExtractor);

-

-		this.rowProvider = rawModel.getCurrentRowAxisProvider();

-		this.columnProvider = rawModel.getCurrentColumnAxisProvider();

-		this.verticalElements = createVerticalElementList();

-		this.horizontalElements = createHorizontalElementList();

-

-		this.cellsMap = HashBiMap.create();

-

-		this.invertAxisListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				if (msg.getEventType() == Notification.SET) {

-					final Object oldValue = msg.getOldValue();

-					final Object newValue = msg.getNewValue();

-					if (oldValue != null && newValue != null) {

-						if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_InvertAxis()) {

-							invertJavaObject();

-

-							// use the method to refresh/merge the table using the appointed values saved in the model.notation

-							resizeAxis();

-							resizeHeader();

-							mergeTable();

-							// for the fun of it!

-							// in fact it is to fix the test org.eclipse.papyrus.sysml.nattable.requirement.tests.tests.RevealRequirementTableTest.test6SelectMultipleElementsInvertAxisAllColumns()

-							// it is a work around and not really a nice fix, because I don't understand the bug...

-							getBodyLayerStack().getRowHideShowLayer().showAllRows();

-							getBodyLayerStack().getColumnHideShowLayer().showAllColumns();

-

-						}

-					}

-				}

-			}

-		};

-

-		rawModel.eAdapters().add(this.invertAxisListener);

-		init();

-

-		changeAxisProvider = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(final Notification msg) {

-				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_CurrentColumnAxisProvider() || msg.getFeature() == NattablePackage.eINSTANCE.getTable_CurrentRowAxisProvider()) {

-					if (msg.getNewValue() != null) {

-						Display.getCurrent().asyncExec(new Runnable() {

-

-							@Override

-							public void run() {

-								init();

-								refreshNatTable();

-							}

-						});

-					}

-				}

-			}

-		};

-

-		changeAxisProviderHistory = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(final Notification msg) {

-				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_ColumnAxisProvidersHistory() || msg.getFeature() == NattablePackage.eINSTANCE.getTable_RowAxisProvidersHistory()) {

-					if (msg.getNewValue() != null) {

-						Display.getCurrent().asyncExec(new Runnable() {

-

-							@Override

-							public void run() {

-								init();

-							}

-						});

-					}

-				}

-			}

-

-		};

-

-		rawModel.eAdapters().add(changeAxisProvider);

-		tableCellsListener = new AdapterImpl() {

-

-			@Override

-			public void notifyChanged(final Notification msg) {

-				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_Cells()) {

-					updateCellMap(msg);

-				}

-			}

-		};

-		rawModel.eAdapters().add(tableCellsListener);

-

-		addListeners();

-	}

-

-	private ListEventListener<Object> listEventListener;

-

-	/**

-	 * add required listener

-	 */

-	protected void addListeners() {

-		this.listEventListener = new ListEventListener<Object>() {

-

-			/**

-			 * 

-			 * @param listChanges

-			 */

-			@Override

-			public void listChanged(ListEvent<Object> listChanges) {

-				manageEventListChanges(listChanges);

-			}

-

-		};

-		EventList<?> rowsList = (EventList<?>) getRowElementsList();

-		EventList<?> columnsList = (EventList<?>) getColumnElementsList();

-		rowsList.addListEventListener(this.listEventListener);

-		columnsList.addListEventListener(this.listEventListener);

-	}

-

-	/**

-	 * 

-	 * @param listChanges

-	 *            manage the list events

-	 */

-	private void manageEventListChanges(ListEvent<Object> listChanges) {

-		EventList<?> sourceList = listChanges.getSourceList();

-		CellEditorDeclaration declaration = TableHelper.getCellEditorDeclaration(this);

-		boolean needConfiguration = false;

-		if (CellEditorDeclaration.COLUMN == declaration && sourceList == getColumnElementsList()) {

-			needConfiguration = true;

-		}

-		if (CellEditorDeclaration.ROW == declaration && sourceList == getRowElementsList()) {

-			needConfiguration = true;

-		}

-		if (needConfiguration) {

-			configureCellAxisEditor();

-			configureFilters();

-			refreshNatTable();

-		}

-	}

-

-	/**

-	 * remove required listener

-	 */

-	protected void removeListeners() {

-		EventList<?> rowsList = (EventList<?>) getRowElementsList();

-		EventList<?> columnsList = (EventList<?>) getColumnElementsList();

-		rowsList.removeListEventListener(this.listEventListener);

-		columnsList.removeListEventListener(this.listEventListener);

-	}

-

-

-	/**

-	 *

-	 * @return

-	 * 		the new list to use for vertical element

-	 */

-	protected List<Object> createVerticalElementList() {

-		// return Collections.synchronizedList(new ArrayList<Object>());

-		this.basicVerticalList = GlazedLists.eventList(new ArrayList<Object>());

-		// it required than vertical element is a filter list -> warning to invert axis?

-		this.verticalFilterList = new FilterList<Object>(this.basicVerticalList);

-		return this.verticalFilterList;

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		the new list to use for horizontal element

-	 */

-	protected List<Object> createHorizontalElementList() {

-		// return Collections.synchronizedList(new ArrayList<Object>());

-		this.basicHorizontalList = GlazedLists.eventList(new ArrayList<Object>());

-		FilterList<Object> filteredList = new FilterList<Object>(this.basicHorizontalList);

-		this.horizontalFilterList = filteredList;

-		return this.horizontalFilterList;

-	}

-

-

-	@Override

-	public NatTable createNattable(Composite parent, int style, IWorkbenchPartSite site) {

-		updateCellMap(null);

-		final NatTable nattable = super.createNattable(parent, style, site);

-		this.refreshListener = new CommandStackListener() {

-

-			/**

-			 *

-			 * @see org.eclipse.emf.common.command.CommandStackListener#commandStackChanged(java.util.EventObject)

-			 *

-			 * @param event

-			 */

-			@Override

-			public void commandStackChanged(EventObject event) {

-				// we refresh the table after each command, only when it is visible

-				// its allows to refresh the text and the appearance of the table

-				// this refresh doesn't manage the add/remove axis

-				Display.getDefault().asyncExec(new Runnable() {

-

-					@Override

-					public void run() {

-						if (nattable != null && !nattable.isDisposed() && nattable.isVisible()) {

-							nattable.doCommand(new VisualRefreshCommand());

-						}

-					}

-				});

-

-			}

-		};

-

-		getContextEditingDomain().getCommandStack().addCommandStackListener(this.refreshListener);

-		if (getTableEditingDomain() != null && getTableEditingDomain() != getContextEditingDomain()) {

-			getTableEditingDomain().getCommandStack().addCommandStackListener(this.refreshListener);

-		}

-		this.focusListener = new FocusListener() {

-

-			@Override

-			public void focusLost(FocusEvent e) {

-				// nothing to do

-			}

-

-			@Override

-			public void focusGained(FocusEvent e) {

-				updateToggleActionState();

-			}

-		};

-		nattable.addFocusListener(this.focusListener);

-

-		this.layerListener = new ILayerListener() {

-

-			@Override

-			public void handleLayerEvent(ILayerEvent event) {

-				updateToggleActionState();

-			}

-		};

-		nattable.addLayerListener(layerListener);

-

-		updateToggleActionState();// required, because the focus listener is not notified just after the creation of the widget

-		return nattable;

-	}

-

-	/**

-	 * this command update the status of the toggle actions

-	 */

-	@Override

-	protected void updateToggleActionState() {

-		super.updateToggleActionState();

-		final ICommandService commandService = EclipseCommandUtils.getCommandService();

-		if (commandService != null) {

-

-			final AbstractHeaderAxisConfiguration columnAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable());

-			final AbstractHeaderAxisConfiguration rowAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(getTable());

-			// update the header configuration

-			org.eclipse.core.commands.Command command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISPLAY_INDEX_ID);

-			updateToggleCommandState(command, columnAxisConfiguration.isDisplayIndex());

-

-			command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISPLAY_LABEL_ID);

-			updateToggleCommandState(command, columnAxisConfiguration.isDisplayLabel());

-

-			command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISPLAY_INDEX_STYLE_ID);

-			updateRadioCommandState(command, columnAxisConfiguration.getIndexStyle().getLiteral());

-

-			command = commandService.getCommand(CommandIds.COMMAND_ROW_DISPLAY_INDEX_ID);

-			updateToggleCommandState(command, rowAxisConfiguration.isDisplayIndex());

-

-			command = commandService.getCommand(CommandIds.COMMAND_ROW_DISPLAY_LABEL_ID);

-			updateToggleCommandState(command, rowAxisConfiguration.isDisplayLabel());

-

-			command = commandService.getCommand(CommandIds.COMMAND_ROW_DISPLAY_INDEX_STYLE_ID);

-			updateRadioCommandState(command, rowAxisConfiguration.getIndexStyle().getLiteral());

-

-

-			// update the label header configuration

-			final List<ILabelProviderConfiguration> columnLabelConfigurations = columnAxisConfiguration.getOwnedLabelConfigurations();

-			final List<ILabelProviderConfiguration> rowLabelConfigurations = rowAxisConfiguration.getOwnedLabelConfigurations();

-			for (final ILabelProviderConfiguration current : columnLabelConfigurations) {

-				if (current instanceof ObjectLabelProviderConfiguration) {

-					final ObjectLabelProviderConfiguration labelConfig = (ObjectLabelProviderConfiguration) current;

-					command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_DISPLAY_ICON);

-					updateToggleCommandState(command, labelConfig.isDisplayIcon());

-

-					command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_DISPLAY_LABEL);

-					updateToggleCommandState(command, labelConfig.isDisplayLabel());

-

-					if (labelConfig instanceof FeatureLabelProviderConfiguration) {

-						final FeatureLabelProviderConfiguration labelFeatureConf = (FeatureLabelProviderConfiguration) labelConfig;

-						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_IS_DERIVED);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayIsDerived());

-

-						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_MULTIPLICITY);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayMultiplicity());

-

-						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_TYPE);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayType());

-

-

-						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_NAME);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayName());

-					}

-				}

-			}

-

-			for (final ILabelProviderConfiguration current : rowLabelConfigurations) {

-				if (current instanceof ObjectLabelProviderConfiguration) {

-					final ObjectLabelProviderConfiguration labelConfig = (ObjectLabelProviderConfiguration) current;

-

-					command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_DISPLAY_ICON);

-					updateToggleCommandState(command, labelConfig.isDisplayIcon());

-

-					command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_DISPLAY_LABEL);

-					updateToggleCommandState(command, labelConfig.isDisplayLabel());

-

-					if (labelConfig instanceof FeatureLabelProviderConfiguration) {

-						final FeatureLabelProviderConfiguration labelFeatureConf = (FeatureLabelProviderConfiguration) labelConfig;

-						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_IS_DERIVED);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayIsDerived());

-

-						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_MULTIPLICITY);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayMultiplicity());

-

-						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_TYPE);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayType());

-

-						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_NAME);

-						updateToggleCommandState(command, labelFeatureConf.isDisplayName());

-					}

-				}

-			}

-

-			// update the property IMasterObjectAxisProvider#disconnectslave

-			if (columnProvider instanceof ISlaveAxisProvider) {

-				command = commandService.getCommand(CommandIds.COMMAND_ROW_DISCONNECT_SLAVE);

-				updateToggleCommandState(command, ((IMasterAxisProvider) rowProvider).isDisconnectSlave());

-			}

-

-			if (rowProvider instanceof ISlaveAxisProvider) {

-				command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISCONNECT_SLAVE);

-				updateToggleCommandState(command, ((IMasterAxisProvider) columnProvider).isDisconnectSlave());

-			}

-

-			// we update the state for the invert axis command

-			command = commandService.getCommand(CommandIds.COMMAND_INVERT_AXIS);

-			updateToggleCommandState(command, getTable().isInvertAxis());

-

-			// updates the state of each merge actions commands

-			command = commandService.getCommand(CommandIds.COMMAND_MERGE_ROWS);

-			updateToggleCommandState(command, getToggleStateAllRows());

-

-			command = commandService.getCommand(CommandIds.COMMAND_MERGE_COLUMNS);

-			updateToggleCommandState(command, getToggleStateAllColumns());

-

-			command = commandService.getCommand(CommandIds.COMMAND_MERGE_SELECTED_ROWS);

-			updateToggleCommandState(command, getToggleStateSelectedRows());

-

-			command = commandService.getCommand(CommandIds.COMMAND_MERGE_SELECTED_COLUMNS);

-			updateToggleCommandState(command, getToggleStateSelectedColumns());

-

-			// the merge of all the elements in the table is not yet supported

-			// command = commandService.getCommand(CommandIds.COMMAND_MERGE_TABLE);

-			// BooleanValueStyle mergeTable = (BooleanValueStyle)getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getBooleanValueStyle(), NamedStyleConstants.MERGE_TABLE);

-			// if(mergeTable != null) {

-			// updateToggleCommandState(command, mergeTable.isBooleanValue());

-			// } else {

-			// updateToggleCommandState(command, false);

-			// }

-

-

-

-

-		} else {

-			throw new RuntimeException(String.format("The Eclipse service %s has not been found", ICommandService.class)); //$NON-NLS-1$

-		}

-

-	}

-

-	/**

-	 *

-	 * @param command

-	 *            an eclipse command

-	 * @param newValue

-	 *            the new boolean value to set to the state of this command

-	 */

-	private void updateToggleCommandState(final org.eclipse.core.commands.Command command, final boolean newValue) {

-		EclipseCommandUtils.updateToggleCommandState(command, newValue);

-	}

-

-

-	/**

-	 *

-	 * @param command

-	 *            an eclispe command

-	 * @param newValue

-	 *            the new value to set to the state of this command

-	 */

-	protected void updateRadioCommandState(final org.eclipse.core.commands.Command command, final Object newValue) {

-		EclipseCommandUtils.updateRadioCommandState(command, newValue);

-	}

-

-	public void invertJavaObject() {

-		getRowSortModel().clear();// we clear the sort model

-		AbstractAxisProvider newColumProvider = this.rowProvider;

-		AbstractAxisProvider newRowProvider = this.columnProvider;

-		List<Object> newVerticalElementList = this.horizontalElements;

-		List<Object> newHorizontalElementList = this.verticalElements;

-		ICompositeAxisManager newRowManager = this.columnManager;

-		ICompositeAxisManager newColumnManager = this.rowManager;

-

-		NattableModelManager.this.columnProvider = newColumProvider;

-		NattableModelManager.this.rowProvider = newRowProvider;

-

-		NattableModelManager.this.verticalElements = newVerticalElementList;

-		NattableModelManager.this.horizontalElements = newHorizontalElementList;

-

-		EventList<Object> newHorizontalBasicList = this.basicVerticalList;

-		EventList<Object> newVerticalBasicList = this.basicHorizontalList;

-

-		FilterList<Object> newVerticalFilterLilst = this.horizontalFilterList;

-		FilterList<Object> newHorizontalFilterList = this.verticalFilterList;

-

-		this.basicVerticalList = newVerticalBasicList;

-		this.basicHorizontalList = newHorizontalBasicList;

-		this.horizontalFilterList = newHorizontalFilterList;

-		this.verticalFilterList = newVerticalFilterLilst;

-

-

-		NattableModelManager.this.rowManager = newRowManager;

-		NattableModelManager.this.columnManager = newColumnManager;

-		this.rowManager.setAxisComparator(null);

-		this.columnManager.setAxisComparator(null);

-

-		updateToggleActionState();

-		// configureNatTable();

-

-		configureCellAxisEditor();

-		configureFilters();

-		refreshNatTable();

-	}

-

-	public EventList<Object> getHorizontalBasicEventList() {

-		return this.basicHorizontalList;

-	}

-

-	public FilterList<Object> getHorizontalFilterEventList() {

-		return this.horizontalFilterList;

-	}

-

-	public FilterList<Object> getVerticalFilterList() {

-		return this.verticalFilterList;

-	}

-

-	public void resizeAxis() {

-		initTableAxis();

-		refreshNatTable();

-	}

-

-	public void resizeHeader() {

-		initTableHeaders();

-		refreshNatTable();

-	}

-

-	public void mergeTable() {

-		initTableMerge();

-		refreshNatTable();

-	}

-

-	/**

-	 * create the line and the columns managers

-	 */

-	protected void init() {

-		if (this.columnManager != null) {

-			this.columnManager.dispose();

-		}

-		if (this.rowManager != null) {

-			this.rowManager.dispose();

-		}

-		this.columnProvider = getTable().getCurrentColumnAxisProvider();

-		this.rowProvider = getTable().getCurrentRowAxisProvider();

-		this.columnManager = createAxisManager(getTable().getTableConfiguration().getColumnHeaderAxisConfiguration().getAxisManagers(), getTable().getCurrentColumnAxisProvider(), true);

-		this.rowManager = createAxisManager(getTable().getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers(), getTable().getCurrentRowAxisProvider(), false);

-

-		boolean allIsSlave = this.columnManager.isSlave() && this.rowManager.isSlave();

-		Assert.isTrue(!allIsSlave, Messages.NattableModelManager_AtLeastOfOneTheAxisManagerMustBeAMaster);

-	}

-

-	/**

-	 *

-	 * @param ids

-	 *            the ids of the axis manager to use

-	 * @param contentProvider

-	 *            the content provider in the model

-	 * @return the created axis manager to use to manage the {@link IAxisContentsProvider}

-	 */

-	protected ICompositeAxisManager createAxisManager(final List<AxisManagerRepresentation> representations, final AbstractAxisProvider contentProvider, final boolean columnAxisManager) {

-		final ICompositeAxisManager compositeAxisManager = new CompositeAxisManager();

-		final List<IAxisManager> managers = new ArrayList<IAxisManager>();

-		for (AxisManagerRepresentation current : representations) {

-			final IAxisManager manager = AxisManagerFactory.INSTANCE.getAxisManager(current);

-			assert manager != null;

-			manager.init(this, current, contentProvider);

-			managers.add(manager);

-		}

-		compositeAxisManager.init(this, null, contentProvider);

-		compositeAxisManager.setSubAxisManager(managers);

-		return compositeAxisManager;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 *

-	 */

-	@Override

-	public void dispose() {

-		if (this.tableEditingDomain != null) {

-			if (this.tableEditingDomain.getCommandStack() != null) {

-				this.tableEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);

-			}

-			if (this.tableEditingDomain != null) {

-				this.tableEditingDomain.removeResourceSetListener(resourceSetListener);

-			}

-

-		}

-

-		if (this.contextEditingDomain != null) {

-			if (this.contextEditingDomain.getCommandStack() != null) {

-				this.contextEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);

-			}

-			if (this.contextEditingDomain != null) {

-				this.contextEditingDomain.removeResourceSetListener(resourceSetListener);

-			}

-		}

-		this.columnManager.dispose();

-		this.rowManager.dispose();

-		Table table = getTable();

-		if (table != null && this.tableCellsListener != null) {

-			table.eAdapters().remove(this.tableCellsListener);

-		}

-		if (this.cellsMap != null) {

-			this.cellsMap.clear();

-		}

-		if (this.natTable != null) {

-			natTable.removeLayerListener(layerListener);

-		}

-

-		removeListeners();

-		super.dispose();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#addRows(java.util.Collection)

-	 *

-	 * @param objectsToAdd

-	 *            the list of the objects to add in rows

-	 */

-	@Override

-	public void addRows(final Collection<Object> objectsToAdd) {

-		final TransactionalEditingDomain domain = getContextEditingDomain();

-		final Command cmd = getAddRowElementCommand(objectsToAdd);

-		if (cmd != null && cmd.canExecute()) {

-			domain.getCommandStack().execute(cmd);

-		}

-	}

-

-	/**

-	 * called when the manager is used vertically

-	 */

-	@Override

-	public int getColumnCount() {

-		return this.getColumnElementsList().size();

-	}

-

-	/**

-	 * called when the manager is used horizontally

-	 */

-

-	@Override

-	public int getRowCount() {

-		return this.getRowElementsList().size();

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#addColumns(java.util.Collection)

-	 *

-	 * @param objectsToAdd

-	 *            the list of the objects to add in columns

-	 */

-	@Override

-	public void addColumns(final Collection<Object> objectsToAdd) {

-		final TransactionalEditingDomain domain = getContextEditingDomain();

-		final Command cmd = getAddColumnElementCommand(objectsToAdd);

-		if (cmd != null && cmd.canExecute()) {

-			domain.getCommandStack().execute(cmd);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#removeColumns(java.util.Collection)

-	 *

-	 * @param objetsToRemove

-	 */

-	@Override

-	public void removeColumns(Collection<Object> objetsToRemove) {

-		final TransactionalEditingDomain domain = getContextEditingDomain();

-		final Command cmd = getDestroyColumnElementCommand(objetsToRemove);

-		if (cmd != null && cmd.canExecute()) {

-			domain.getCommandStack().execute(cmd);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#removeRows(java.util.Collection)

-	 *

-	 * @param objectsToRemove

-	 */

-	@Override

-	public void removeRows(Collection<Object> objectsToRemove) {

-		final TransactionalEditingDomain domain = getContextEditingDomain();

-		final Command cmd = getDestroyRowElementCommand(objectsToRemove);

-		if (cmd != null && cmd.canExecute()) {

-			domain.getCommandStack().execute(cmd);

-		}

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getBodyDataProvider()

-	 *

-	 * @return the data provider for the body of the table

-	 */

-	@Override

-	public IDataProvider getBodyDataProvider() {

-		return this;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)

-	 *

-	 * @param columnIndex

-	 *            the index of the column

-	 * @param rowIndex

-	 *            the index of the row

-	 * @return the contents to display in the cell localted to columnIndex and

-	 *         rowIndex

-	 */

-	@Override

-	public Object getDataValue(final int columnIndex, final int rowIndex) {

-		final Object row;

-		final Object column;

-		final Object obj1 = this.verticalElements.get(columnIndex);

-		final Object obj2 = this.horizontalElements.get(rowIndex);

-		if (getTable().isInvertAxis()) {

-			column = obj2;

-			row = obj1;

-		} else {

-			row = obj2;

-			column = obj1;

-		}

-		return CellManagerFactory.INSTANCE.getCrossValue(column, row, this);

-	}

-

-	@Override

-	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {

-		final Object row;

-		final Object column;

-		final Object obj1 = this.verticalElements.get(columnIndex);

-		final Object obj2 = this.horizontalElements.get(rowIndex);

-		if (getTable().isInvertAxis()) {

-			column = obj2;

-			row = obj1;

-		} else {

-			row = obj2;

-			column = obj1;

-		}

-		CellManagerFactory.INSTANCE.setCellValue(getContextEditingDomain(), column, row, newValue, this);

-	}

-

-	/**

-	 * refresh NatTable (asyncExec)

-	 */

-	public void refreshNatTable() {

-		// This refresh code has been duplicated from the refresh of the ModelExplorer (class ModelExplorerView)

-		final Runnable schedule;

-		if (this.natTable != null && !this.natTable.isDisposed()) {

-			synchronized (this) {

-				if (refreshRunnable == null) {

-					// No refresh is yet pending. Schedule one

-					schedule = createRefreshRunnable();

-					refreshRunnable = schedule;

-				} else {

-					schedule = null;

-				}

-			}

-

-			if (schedule != null) {

-				Control control = this.natTable;

-				Display display = ((control == null) || control.isDisposed()) ? null : control.getDisplay();

-

-				if (display != null) {

-					// Don't need to schedule a refresh if we have no control or it's disposed

-					display.asyncExec(schedule);

-				}

-			}

-		}

-	}

-

-	/**

-	 *

-	 * @return

-	 * 		a new runnable for the refreash action

-	 */

-	private Runnable createRefreshRunnable() {

-		return new Runnable() {

-

-			@Override

-			public void run() {

-				// Only run if I'm still pending

-				synchronized (NattableModelManager.this) {

-					if (refreshRunnable != this) {

-						return;

-					}

-

-					refreshRunnable = null;

-				}

-

-				refreshInUIThread();

-			}

-		};

-	}

-

-	/**

-	 * refresh the view.

-	 */

-	protected void refreshInUIThread() {

-		// Need to refresh, even if (temporarily) invisible

-		// (Better alternative?: store refresh event and execute once visible again)

-		if (this.natTable != null && this.natTable.isDisposed()) {

-			return;

-		}

-

-		// avoid reentrant call

-		// Refresh only of we are not already refreshing.

-		if (isRefreshing.compareAndSet(false, true)) {

-			this.natTable.refresh();

-			isRefreshing.set(false);

-		}

-	}

-

-	/**

-	 *

-	 * @param axis

-	 *            the axis for which must refresh the contents

-	 */

-	public void updateAxisContents(final AbstractAxisProvider axis) {

-

-		try {

-			getContextEditingDomain().runExclusive(new Runnable() {

-

-				@Override

-				public void run() {

-					Display.getDefault().syncExec(new Runnable() {

-

-						@Override

-						public void run() {

-							if (NattableModelManager.this.natTable != null && !NattableModelManager.this.natTable.isDisposed()) {

-								if (NattableModelManager.this.getTable() != null && NattableModelManager.this.getTable().getTableConfiguration() != null) {

-									if (axis == NattableModelManager.this.columnProvider) {

-										updateColumnContents();

-										NattableModelManager.this.getRowSortModel().updateSort();

-									} else {

-										updateRowContents();

-									}

-								}

-							}

-						}

-					});

-

-				}

-

-			});

-		} catch (InterruptedException e) {

-			Activator.log.error(e);

-		}

-

-	}

-

-	/**

-	 * refresh the row contents

-	 */

-	private void updateRowContents() {

-		NattableModelManager.this.rowManager.updateAxisContents();

-		CellEditorDeclaration declaration = getCellEditorDeclarationToUse(getTable());

-		if (declaration.equals(CellEditorDeclaration.ROW)) {

-			// configureNatTable(); : see bug 463058: [Table 2] Invert Axis + add/remove columns break the display of the table

-			refreshNatTable();

-		} else {

-			refreshNatTable();

-		}

-	}

-

-

-

-	/**

-	 * refresh the column contents

-	 */

-	private void updateColumnContents() {

-		NattableModelManager.this.columnManager.updateAxisContents();

-		CellEditorDeclaration declaration = getCellEditorDeclarationToUse(getTable());

-		if (declaration.equals(CellEditorDeclaration.COLUMN)) {

-			// configureNatTable(); : see bug 463058: [Table 2] Invert Axis + add/remove columns break the display of the table

-			refreshNatTable();

-		} else {

-			refreshNatTable();

-		}

-	}

-

-	/**

-	 *

-	 * @param table

-	 *            the table

-	 * @return

-	 * 		the celleditor declaration to use according to the table configuration and {@link Table#isInvertAxis()}

-	 */

-	private CellEditorDeclaration getCellEditorDeclarationToUse(final Table table) {

-		CellEditorDeclaration declaration = table.getTableConfiguration().getCellEditorDeclaration();

-		if (getTable().isInvertAxis()) {

-			if (declaration.equals(CellEditorDeclaration.COLUMN)) {

-				declaration = CellEditorDeclaration.ROW;

-			} else if (declaration.equals(CellEditorDeclaration.ROW)) {

-				declaration = CellEditorDeclaration.COLUMN;

-			}

-		}

-		return declaration;

-	}

-

-	@Override

-	public List<Object> getColumnElementsList() {

-		return this.verticalElements;

-	}

-

-	@Override

-	public List<Object> getRowElementsList() {

-		// return this.eventList;

-		return this.horizontalElements;

-	}

-

-

-	@Override

-	public boolean canInsertRow(Collection<Object> objectsToAdd, int index) {

-		return this.rowManager.canInsertAxis(objectsToAdd, index);

-	}

-

-	@Override

-	public boolean canInsertColumns(Collection<Object> objectsToAdd, int index) {

-		return this.columnManager.canInsertAxis(objectsToAdd, index);

-	}

-

-	@Override

-	public boolean canDropColumnsElement(Collection<Object> objectsToAdd) {

-		return this.columnManager.canDropAxisElement(objectsToAdd);

-	}

-

-	@Override

-	public boolean canDropRowElement(Collection<Object> objectsToAdd) {

-		return this.rowManager.canDropAxisElement(objectsToAdd);

-	}

-

-	@Override

-	public void insertRows(Collection<Object> objectsToAdd, int index) {

-		this.rowManager.getInsertAxisCommand(objectsToAdd, index);

-

-	}

-

-	@Override

-	public void insertColumns(Collection<Object> objectsToAdd, int index) {

-		this.columnManager.getInsertAxisCommand(objectsToAdd, index);

-	}

-

-	@Override

-	public Object getColumnElement(int index) {

-		if (index < 0 || index >= this.verticalElements.size()) {

-			return null;

-		}

-		return this.verticalElements.get(index);

-	}

-

-	@Override

-	public Object getRowElement(int index) {

-		if (index < 0 || index >= this.horizontalElements.size()) {

-			return null;

-		}

-		return this.horizontalElements.get(index);

-	}

-

-	public List<Object> getElementsList(AbstractAxisProvider axisProvider) {

-		if (axisProvider == this.columnProvider) {

-			return this.verticalElements;

-		} else if (axisProvider == this.rowProvider) {

-			return this.horizontalElements;

-		}

-		return null;

-	}

-

-	@Override

-	public boolean canMoveRows() {

-		return this.rowManager.canMoveAxis();

-	}

-

-	@Override

-	public boolean canMoveColumns() {

-		return this.columnManager.canMoveAxis();

-	}

-

-	@Override

-	public void moveColumnElement(final Object axisToMove, final int newIndex) {

-		this.columnManager.moveAxis(axisToMove, newIndex);

-	}

-

-	// not tested

-	@Override

-	public void moveRowElement(final Object axisToMove, final int newIndex) {

-		this.rowManager.moveAxis(axisToMove, newIndex);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#invertAxis()

-	 *

-	 */

-	@Override

-	public void invertAxis() {

-		final CompoundCommand cmd = new CompoundCommand(Messages.NattableModelManager_SwitchLinesAndColumns);

-		final TransactionalEditingDomain domain = getContextEditingDomain();

-		boolean oldValue = getTable().isInvertAxis();

-		if (canInvertAxis()) {

-			Command tmp = new SetCommand(domain, getTable(), NattablePackage.eINSTANCE.getTable_InvertAxis(), !oldValue);

-			cmd.append(tmp);

-			domain.getCommandStack().execute(cmd);

-		}

-

-		// use the method to refresh the table using the appointed values saved in the model.notation

-		initTableAxis();

-		initTableHeaders();

-		initTableMerge();

-	}

-

-	@Override

-	public boolean canInvertAxis() {

-		return this.columnManager.canBeUsedAsRowManager() && this.rowManager.canBeUsedAsColumnManager();

-	}

-

-	@Override

-	public boolean canCreateRowElement(String elementType) {

-		return this.rowManager.canCreateAxisElement(elementType);

-	}

-

-	@Override

-	public boolean canCreateColumnElement(String elementType) {

-		return this.columnManager.canCreateAxisElement(elementType);

-	}

-

-	@Override

-	public Command getAddRowElementCommand(Collection<Object> objectsToAdd) {

-		final TransactionalEditingDomain domain = getContextEditingDomain();

-		final CompoundCommand cmd = new CompoundCommand(Messages.NattableModelManager_AddRowCommand);

-		Command tmp = this.rowManager.getAddAxisCommand(domain, objectsToAdd);

-		if (tmp != null) {

-			cmd.append(tmp);

-		}

-		final AbstractAxisProvider rowsProvider = AxisUtils.getAxisProviderUsedForRows(this);

-		final AbstractAxisProvider columnsProvider = AxisUtils.getAxisProviderUsedForColumns(this);

-		boolean addComplementaryAxis = rowsProvider instanceof IMasterAxisProvider && columnsProvider instanceof ISlaveAxisProvider && !((IMasterAxisProvider) rowsProvider).isDisconnectSlave();

-		if (addComplementaryAxis) {

-			tmp = this.columnManager.getComplementaryAddAxisCommand(domain, objectsToAdd);

-			if (tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		return cmd;

-	}

-

-	@Override

-	public Command getAddColumnElementCommand(Collection<Object> objectsToAdd) {

-		final TransactionalEditingDomain domain = getContextEditingDomain();

-		final CompoundCommand cmd = new CompoundCommand(Messages.NattableModelManager_AddColumnCommand);

-		Command tmp = this.columnManager.getAddAxisCommand(domain, objectsToAdd);

-		if (tmp != null) {

-			cmd.append(tmp);

-		}

-		final AbstractAxisProvider rowsProvider = AxisUtils.getAxisProviderUsedForRows(this);

-		final AbstractAxisProvider columnsProvider = AxisUtils.getAxisProviderUsedForColumns(this);

-		boolean addComplementaryAxis = columnsProvider instanceof IMasterAxisProvider && rowsProvider instanceof ISlaveAxisProvider && !((IMasterAxisProvider) columnsProvider).isDisconnectSlave();

-		if (addComplementaryAxis) {

-			tmp = this.rowManager.getComplementaryAddAxisCommand(domain, objectsToAdd);

-			if (tmp != null) {

-				cmd.append(tmp);

-			}

-		}

-		return cmd;

-	}

-

-	public Command getDestroyColumnElementCommand(Collection<Object> objectsToDestroy) {

-		final TransactionalEditingDomain domain = getContextEditingDomain();

-		final Command cmd = this.columnManager.getDestroyAxisCommand(domain, objectsToDestroy);

-		return cmd;

-	}

-

-	public Command getDestroyRowElementCommand(Collection<Object> objectsToDestroy) {

-		final TransactionalEditingDomain domain = getContextEditingDomain();

-		final Command cmd = this.rowManager.getDestroyAxisCommand(domain, objectsToDestroy);

-		return cmd;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getTableAxisElementProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	public ITableAxisElementProvider getTableAxisElementProvider() {

-		return this;

-	}

-

-	/**

-	 * When the axis manager is dynamic, we can't destroy axis

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canCreateDestroyColumnsAxis()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canCreateDestroyColumnsAxis() {

-		return !this.columnManager.isDynamic() && this.columnManager.createPossibleAxisContentProvider(true) != null;

-	}

-

-	/**

-	 * When the axis manager is dynamic, we can't destroy axis

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canCreateDestroyRowsAxis()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean canCreateDestroyRowsAxis() {

-		return !this.rowManager.isDynamic() && this.rowManager.createPossibleAxisContentProvider(true) != null;

-	}

-

-	/**

-	 *

-	 * @param serv

-	 *            the label provider service

-	 * @param editedAxisManager

-	 *            the manager used for the edited axis

-	 * @param secondAxisManager

-	 *            the manager used for the other axis

-	 * @param isEditingColumns

-	 *            boolean indicating if we are editing columns or rows

-	 */

-	private final void openCreateDestroyAxisManagerDialog(boolean isEditingColumns) {

-		final String dialogTitle;

-		final String dialogCheckBoxTootip;

-		final String dialogQuestion;

-

-		final IAxisManager editedAxisManager;

-		final IAxisManager secondAxisManager;

-		final String checkBoxMessage = Messages.NattableModelManager_DisconnectThisAxisManager;

-		if (isEditingColumns) {

-			dialogTitle = Messages.NattableModelManager_SelectColumns;

-			dialogCheckBoxTootip = Messages.NattableModelManager_DisableTheAutomaticAdditionOfColumnsWhenARowIsAdded;

-			dialogQuestion = String.format(Messages.NattableModelManager_TheCheckBoxHasNotBeenCheckedToAvoidAutomaticColumnAddition, checkBoxMessage);

-

-			editedAxisManager = columnManager;

-			secondAxisManager = rowManager;

-		} else {

-			dialogTitle = Messages.NattableModelManager_SelectRows;

-			dialogCheckBoxTootip = Messages.NattableModelManager_DisableTheAutomaticAdditionOfRowsWhenAColumnIsAdded;

-			dialogQuestion = String.format(Messages.NattableModelManager_TheCheckBoxHasNotBeenCheckedToAvoidAutomaticRowAddition, checkBoxMessage);

-

-			editedAxisManager = rowManager;

-			secondAxisManager = columnManager;

-		}

-		final LabelProviderService serv = this.natTable.getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProvider labelProvider = serv.getLabelProvider();

-		final AbstractAxisProvider editedAxisProvider = editedAxisManager.getRepresentedContentProvider();

-		final AbstractAxisProvider secondAxisProvider = secondAxisManager.getRepresentedContentProvider();

-		ReferenceSelector selector = new ReferenceSelector(true) {

-

-			@Override

-			public void createControls(Composite parent) {

-				super.createControls(parent);

-				this.treeViewer.setComparator(new ViewerComparator(new StringComparator()));// should always be string element

-			}

-		};

-		selector.setLabelProvider(labelProvider);

-

-		IStaticContentProvider provider = editedAxisManager.createPossibleAxisContentProvider(true);

-		if (provider != null) {

-			selector.setContentProvider(new FlattenableRestrictedFilteredContentProvider((IRestrictedContentProvider) provider, selector));

-			boolean canBeReorder = (!editedAxisManager.isDynamic()) && editedAxisManager.canMoveAxis();

-			final DisplayedAxisSelectorDialog dialog = new DisplayedAxisSelectorDialog(Display.getDefault().getActiveShell(), selector, dialogTitle, true, canBeReorder, -1);

-			boolean displayCheckBox = editedAxisProvider instanceof ISlaveAxisProvider;

-			dialog.setDisplayCheckBox(displayCheckBox);

-			boolean checkboxValue = secondAxisProvider instanceof IMasterAxisProvider && ((IMasterAxisProvider) secondAxisProvider).isDisconnectSlave();

-			if (displayCheckBox) {

-				dialog.setCheckBoxValues(checkBoxMessage, dialogCheckBoxTootip, checkboxValue);

-			}

-

-			dialog.setInformationDialogValues(Messages.NattableModelManager_DisconnectAxisManagerInformationDialogTitle, dialogQuestion);

-			dialog.setLabelProvider(labelProvider);

-			final List<Object> initialSelection = ((CompositeAxisManager) editedAxisManager).getAllManagedAxis(true);

-			dialog.setInitialElementSelections(new ArrayList<Object>(initialSelection));

-

-			int open = dialog.open();

-			if (open == Window.OK) {

-				Collection<Object> existingColumns = initialSelection;

-				ArrayList<Object> checkedColumns = new ArrayList<Object>();

-				final List<Object> result = Arrays.asList(dialog.getResult());

-				checkedColumns.addAll(result);

-

-				ArrayList<Object> columnsToAdd = new ArrayList<Object>(checkedColumns);

-				columnsToAdd.removeAll(existingColumns);

-				CompoundCommand compoundCommand = new CompoundCommand("Update Existing Axis Command"); //$NON-NLS-1$

-				if (columnsToAdd.size() > 0) {

-					Command addAxisElementCommand = null;

-					if (isEditingColumns) {

-						addAxisElementCommand = getAddColumnElementCommand(columnsToAdd);

-					} else {

-						addAxisElementCommand = getAddRowElementCommand(columnsToAdd);

-					}

-					compoundCommand.append(addAxisElementCommand);

-				}

-

-				ArrayList<Object> axisToDestroy = new ArrayList<Object>(existingColumns);

-				axisToDestroy.removeAll(checkedColumns);

-				if (axisToDestroy.size() > 0) {

-					Command destroyAxisElementCommand = null;

-					if (isEditingColumns) {

-						destroyAxisElementCommand = getDestroyColumnElementCommand(axisToDestroy);

-					} else {

-						destroyAxisElementCommand = getDestroyRowElementCommand(axisToDestroy);

-					}

-					compoundCommand.append(destroyAxisElementCommand);

-				}

-

-				final boolean newState = dialog.isChecked();

-				if (displayCheckBox && checkboxValue != newState) {

-					final TransactionalEditingDomain domain = getTableEditingDomain();

-					final IEditCommandRequest request = new SetRequest(domain, secondAxisProvider, NattableaxisproviderPackage.eINSTANCE.getIMasterAxisProvider_DisconnectSlave(), newState);

-					final IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(secondAxisProvider);

-					compoundCommand.append(new GMFtoEMFCommandWrapper(commandProvider.getEditCommand(request)));

-				}

-

-				if (canBeReorder) {

-					final Command setOrderCommand = ((ICompositeAxisManager) editedAxisManager).getSetNewAxisOrderCommand(result);

-					if (setOrderCommand != null) {

-						compoundCommand.append(setOrderCommand);

-					}

-				}

-				if (!compoundCommand.isEmpty()) {

-					getContextEditingDomain().getCommandStack().execute(compoundCommand);

-					updateToggleActionState();

-				}

-			}

-		} else {

-			MessageDialog.openInformation(Display.getDefault().getActiveShell(), Messages.NattableModelManager_CreateDestroyAxis, Messages.NattableModelManager_ActionNotYetSupported);

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openCreateDestroyRowsManagerDialog()

-	 *

-	 */

-	@Override

-	public void openCreateDestroyRowsManagerDialog() {

-		openCreateDestroyAxisManagerDialog(false);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openCreateDestroyColumnsManagerDialog()

-	 *

-	 */

-	@Override

-	public void openCreateDestroyColumnsManagerDialog() {

-		openCreateDestroyAxisManagerDialog(true);

-	}

-

-	@Override

-	public void sortColumnsByName(final boolean alphabeticOrder) {

-		this.columnManager.sortAxisByName(alphabeticOrder, this.natTable.getConfigRegistry());

-	}

-

-

-	@Override

-	public void sortRowsByName(final boolean alphabeticOrder) {

-		this.rowManager.sortAxisByName(alphabeticOrder, this.natTable.getConfigRegistry());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getVerticalAxisProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	public AbstractAxisProvider getVerticalAxisProvider() {

-		if (getTable().isInvertAxis()) {

-			return getTable().getCurrentRowAxisProvider();

-		} else {

-			return getTable().getCurrentColumnAxisProvider();

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getHorizontalAxisProvider()

-	 *

-	 * @return

-	 */

-	@Override

-	public AbstractAxisProvider getHorizontalAxisProvider() {

-		if (getTable().isInvertAxis()) {

-			return getTable().getCurrentColumnAxisProvider();

-		} else {

-			return getTable().getCurrentRowAxisProvider();

-		}

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canEditColumnHeader(int)

-	 *

-	 * @param evaluationContext

-	 * @return

-	 */

-	@Override

-	public boolean canEditColumnHeader(final NatEventData evaluationContext) {

-		return this.columnManager.canEditAxisHeader(evaluationContext);

-	}

-

-	/***

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canEditRowHeader(org.eclipse.nebula.widgets.nattable.ui.NatEventData)

-	 *

-	 * @param eventData

-	 * @return

-	 */

-	@Override

-	public boolean canEditRowHeader(NatEventData evaluationContext) {

-		return this.rowManager.canEditAxisHeader(evaluationContext);

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openEditRowAliasDialog(org.eclipse.nebula.widgets.nattable.ui.NatEventData)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void openEditRowAliasDialog(NatEventData event) {

-		this.rowManager.openEditAxisAliasDialog(event, event.getNatTable().getRowIndexByPosition(event.getRowPosition()));

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openEditColumnAliasDialog(org.eclipse.nebula.widgets.nattable.ui.NatEventData)

-	 *

-	 * @param event

-	 */

-	@Override

-	public void openEditColumnAliasDialog(NatEventData event) {

-		this.columnManager.openEditAxisAliasDialog(event, event.getNatTable().getColumnIndexByPosition(event.getColumnPosition()));

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getColumnAxisManager()

-	 *

-	 * @return

-	 */

-	@Override

-	public IAxisManager getColumnAxisManager() {

-		return this.columnManager;

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getRowAxisManager()

-	 *

-	 * @return

-	 */

-	@Override

-	public IAxisManager getRowAxisManager() {

-		return this.rowManager;

-	}

-

-

-	@Override

-	public void setTableName(String name) {

-		SetRequest setNameRequest = new SetRequest(getTable(), NattableconfigurationPackage.eINSTANCE.getTableNamedElement_Name(), name);

-		IElementEditService editService = ElementEditServiceUtils.getCommandProvider(getTable());

-		ICommand setNameCommand = editService.getEditCommand(setNameRequest);

-		getTableEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setNameCommand));

-	}

-

-

-	@Override

-	public String getTableName() {

-		return getTable().getName();

-	}

-

-

-	@Override

-	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {

-		if (adapter == NatTable.class) {

-			return this.natTable;

-		}

-		return super.getAdapter(adapter);

-	}

-

-	private void updateCellMap(final Notification notification) {

-		Job job = new Job("Update cells") { //$NON-NLS-1$

-

-			@Override

-			protected IStatus run(final IProgressMonitor monitor) {

-				if (notification == null) {

-					cellsMap.clear();

-					for (final Cell current : getTable().getCells()) {

-						final CellMapKey key = createCellMapKeyWaitingCellAxis(current);

-						cellsMap.put(key, current);

-					}

-				} else {

-					int eventType = notification.getEventType();

-					if (eventType == Notification.ADD) {

-						final Object object = notification.getNewValue();

-						if (object instanceof Cell) {

-							final Cell cell = (Cell) object;

-							final CellMapKey key = createCellMapKeyWaitingCellAxis(cell);

-							cellsMap.put(key, cell);

-						}

-					} else if (eventType == Notification.ADD_MANY) {

-						final Object coll = notification.getNewValue();

-

-						if (coll instanceof Collection<?>) {

-							final Iterator<?> iter = ((Collection<?>) coll).iterator();

-							while (iter.hasNext()) {

-								Object object = iter.next();

-								if (object instanceof Cell) {

-									final Cell cell = (Cell) object;

-									final CellMapKey key = createCellMapKeyWaitingCellAxis(cell);

-									cellsMap.put(key, cell);

-								}

-							}

-						}

-					} else if (eventType == Notification.REMOVE) {

-						Object oldCell = notification.getOldValue();

-						if (oldCell instanceof Cell) {

-							CellMapKey key = cellsMap.inverse().get(oldCell);

-							cellsMap.remove(key);

-						}

-					} else if (eventType == Notification.REMOVE_MANY) {

-						final Object coll = notification.getOldValue();

-

-						if (coll instanceof Collection<?>) {

-							final Iterator<?> iter = ((Collection<?>) coll).iterator();

-							while (iter.hasNext()) {

-								Object object = iter.next();

-								if (object instanceof Cell) {

-									final CellMapKey key = cellsMap.inverse().get(object);

-									cellsMap.remove(key);

-								}

-							}

-						}

-					}

-				}

-

-				return Status.OK_STATUS;

-			}

-		};

-		job.setUser(false);

-		job.setSystem(true);

-		job.addJobChangeListener(new JobChangeAdapter() {

-

-			@Override

-			public void done(IJobChangeEvent event) {

-				refreshNatTable();

-			}

-

-		});

-		job.schedule();

-

-

-		// resourceSetListener used to capture the event pertaining to the merge and resize actions

-		// these events can be used to undo/redo previous actions

-		resourceSetListener = new ResourceSetListener() {

-

-			@Override

-			public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {

-				return null;

-			}

-

-			@Override

-			public void resourceSetChanged(ResourceSetChangeEvent event) {

-

-				for (final Notification notification : event.getNotifications()) {

-					// filter the events to only let through the changes on the current table resource

-					Table notifiedTable = findTable(notification);

-					if (getTable().equals(notifiedTable)) {

-

-						Display.getDefault().asyncExec(new Runnable() {

-

-							@Override

-							public void run() {

-								// already created booleanValues and intValues

-								if (notification.getNotifier() instanceof BooleanValueStyle) {

-									// as the filter already prevented any nonBooleanValueStyle, and therefore any non EObject, it can be cast without verification

-									EObject mergeContainer = ((EObject) notification.getNotifier()).eContainer();

-									if (mergeContainer instanceof AbstractHeaderAxisConfiguration || mergeContainer instanceof IAxis) {

-										mergeTable();

-									}

-								}

-								if (notification.getNotifier() instanceof IntValueStyle) {

-									EObject resizeContainer = ((EObject) notification.getNotifier()).eContainer();

-									if (resizeContainer instanceof AbstractHeaderAxisConfiguration) {

-										resizeHeader();

-									}

-									if (resizeContainer instanceof IAxis) {

-										resizeAxis();

-									}

-								}

-								// newly created booleanValues and intValues

-								if (notification.getNewValue() instanceof BooleanValueStyle) {

-									mergeTable();

-								}

-								if (notification.getNewValue() instanceof IntValueStyle) {

-									if (notification.getNotifier() instanceof IAxis) {

-										resizeAxis();

-									}

-									if (notification.getNotifier() instanceof AbstractHeaderAxisConfiguration) {

-										resizeHeader();

-									}

-								}

-								// reset to the default state using ctrl+z

-								if (notification.getNewValue() == null && notification.getOldValue() != null) {

-									mergeTable();

-									resizeAxis();

-									resizeHeader();

-								}

-							}

-						});

-					}

-				}

-			}

-

-			@Override

-			public boolean isPrecommitOnly() {

-				return false;

-			}

-

-			@Override

-			public boolean isPostcommitOnly() {

-				return false;

-			}

-

-			@Override

-			public boolean isAggregatePrecommitListener() {

-				return false;

-			}

-

-			@Override

-			public NotificationFilter getFilter() {

-				// this filter only lets through the notifications pertaining to the table

-				// the first three conditions handle the modification, the add and the remove of styles

-				// the last seven handle the modified or created objects containing those styles

-				return ((NotificationFilter.createEventTypeFilter(Notification.SET))

-						.or(NotificationFilter.createEventTypeFilter(Notification.ADD))

-						.or(NotificationFilter.createEventTypeFilter(Notification.REMOVE)))

-								.and((NotificationFilter.createNotifierTypeFilter(BooleanValueStyle.class))

-										.or(NotificationFilter.createNotifierTypeFilter(IntValueStyle.class))

-										.or(NotificationFilter.createNotifierTypeFilter(EObjectAxis.class))

-										.or(NotificationFilter.createNotifierTypeFilter(FeatureIdAxis.class))

-										.or(NotificationFilter.createNotifierTypeFilter(EStructuralFeatureAxis.class))

-										.or(NotificationFilter.createNotifierTypeFilter(LocalTableHeaderAxisConfiguration.class))

-										.or(NotificationFilter.createNotifierTypeFilter(Table.class)));

-				// return NotificationFilter.createNotifierTypeFilter(EObject.class);

-			}

-		};

-

-		getContextEditingDomain().addResourceSetListener(resourceSetListener);

-		if (getTableEditingDomain() != null && getTableEditingDomain() != getContextEditingDomain()) {

-			getTableEditingDomain().addResourceSetListener(resourceSetListener);

-		}

-

-	}

-

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getCell(java.lang.Object, java.lang.Object)

-	 *

-	 * @param columnElement

-	 * @param rowElement

-	 * @return

-	 */

-	@Override

-	public Cell getCell(final Object columnElement, final Object rowElement) {

-		final CellMapKey key = new CellMapKey(columnElement, rowElement);

-		return this.cellsMap.get(key);

-	}

-

-	/**

-	 * This method allows to create a CellMapKey object waiting that required fields in the cell have been initialized

-	 *

-	 * @param cell

-	 *            a cell

-	 */

-	private CellMapKey createCellMapKeyWaitingCellAxis(final Cell cell) {

-		while (cell.getColumnWrapper() == null || cell.getRowWrapper() == null) {

-			try {

-				Thread.sleep(100);

-			} catch (InterruptedException e) {

-				Activator.log.error(e);

-			}

-		}

-		while (cell.getColumnWrapper().getElement() == null || cell.getRowWrapper().getElement() == null) {

-			try {

-				Thread.sleep(100);

-			} catch (InterruptedException e) {

-				Activator.log.error(e);

-			}

-		}

-		return new CellMapKey(cell.getColumnWrapper().getElement(), cell.getRowWrapper().getElement());

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getTablePreferenceStore()

-	 *

-	 * @return

-	 */

-	@Override

-	public PreferenceStore getTablePreferenceStore() {

-		return this.localPreferenceStore;

-	}

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#setWorkspacePreferenceStore(org.eclipse.jface.preference.PreferenceStore)

-	 *

-	 * @param store

-	 */

-	@Override

-	public void setWorkspacePreferenceStore(final PreferenceStore store) {

-		this.localPreferenceStore = store;

-	}

-

-

-	// TODO : tmp class to externalize when the filter will works fine

-	public class PapyrusColumnAccesor implements IColumnAccessor<Object> {

-

-		/**

-		 * @see org.eclipse.nebula.widgets.nattable.data.IColumnAccessor#getDataValue(java.lang.Object, int)

-		 *

-		 * @param rowObject

-		 * @param columnIndex

-		 * @return

-		 */

-		@Override

-		public Object getDataValue(Object rowObject, int columnIndex) {

-			return CellManagerFactory.INSTANCE.getCrossValue(getColumnElement(columnIndex), rowObject, NattableModelManager.this);

-		}

-

-		/**

-		 * @see org.eclipse.nebula.widgets.nattable.data.IColumnAccessor#setDataValue(java.lang.Object, int, java.lang.Object)

-		 *

-		 * @param rowObject

-		 * @param columnIndex

-		 * @param newValue

-		 */

-		@Override

-		public void setDataValue(Object rowObject, int columnIndex, Object newValue) {

-			// TODO Auto-generated method stub

-

-		}

-

-		/**

-		 * @see org.eclipse.nebula.widgets.nattable.data.IColumnAccessor#getColumnCount()

-		 *

-		 * @return

-		 */

-		@Override

-		public int getColumnCount() {

-			// TODO Auto-generated method stub

-			return 0;

-		}

-

-	}

-

-	/**

-	 * @return

-	 * 		the filter strategy to use

-	 *

-	 */

-	@Override

-	protected IFilterStrategy<Object> createFilterStrategy() {

-		return new PapyrusFilterStrategy(this, new PapyrusColumnAccesor());

-		// TODO

-		// FIXME warning to invert axis

-		// return new PapyrusFilterStrategy(this, this.horizontalFilterList, new PapyrusColumnAccesor(), null);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012 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.manager.table;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EventObject;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.transaction.NotificationFilter;
+import org.eclipse.emf.transaction.ResourceSetChangeEvent;
+import org.eclipse.emf.transaction.ResourceSetListener;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.preference.PreferenceStore;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.jface.window.Window;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.command.VisualRefreshCommand;
+import org.eclipse.nebula.widgets.nattable.data.IColumnAccessor;
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
+import org.eclipse.nebula.widgets.nattable.filterrow.IFilterStrategy;
+import org.eclipse.nebula.widgets.nattable.layer.ILayerListener;
+import org.eclipse.nebula.widgets.nattable.layer.event.ILayerEvent;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.nebula.widgets.nattable.ui.NatEventData;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.command.CommandIds;
+import org.eclipse.papyrus.infra.nattable.dialog.DisplayedAxisSelectorDialog;
+import org.eclipse.papyrus.infra.nattable.filter.PapyrusFilterStrategy;
+import org.eclipse.papyrus.infra.nattable.manager.axis.AxisManagerFactory;
+import org.eclipse.papyrus.infra.nattable.manager.axis.CompositeAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.axis.ICompositeAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;
+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.nattableaxis.EObjectAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.ISlaveAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;
+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.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.BooleanValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.selection.ISelectionExtractor;
+import org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.CellMapKey;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.nattable.utils.StringComparator;
+import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.tools.util.EclipseCommandUtils;
+import org.eclipse.papyrus.infra.widgets.providers.FlattenableRestrictedFilteredContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.commands.ICommandService;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+
+import ca.odell.glazedlists.EventList;
+import ca.odell.glazedlists.FilterList;
+import ca.odell.glazedlists.GlazedLists;
+import ca.odell.glazedlists.event.ListEvent;
+import ca.odell.glazedlists.event.ListEventListener;
+
+/**
+ * All the code concerning tree table is in the subclass {@link TreeNattableModelManager}
+ *
+ *
+ */
+public class NattableModelManager extends AbstractNattableWidgetManager implements INattableModelManager {
+
+	/**
+	 * the column manager
+	 */
+	private ICompositeAxisManager columnManager;
+
+	/**
+	 * the line manager
+	 */
+	private ICompositeAxisManager rowManager;
+
+	/**
+	 * the model of the table on which we are working
+	 */
+	private List<Object> verticalElements;
+
+	private List<Object> horizontalElements;
+
+	protected FilterList<Object> verticalFilterList;
+
+	protected FilterList<Object> horizontalFilterList;
+
+	protected EventList<Object> basicVerticalList;
+
+	protected EventList<Object> basicHorizontalList;
+
+	private Adapter invertAxisListener;
+
+	private AbstractAxisProvider rowProvider;
+
+	private AbstractAxisProvider columnProvider;
+
+	/**
+	 * this listener listen the stack events and refresh nattable
+	 */
+	private CommandStackListener refreshListener;
+
+	/**
+	 * the focus listener
+	 */
+	private FocusListener focusListener;
+
+	/**
+	 * the resourceSet listener
+	 */
+	private ResourceSetListener resourceSetListener;
+
+	/**
+	 * layerListener to update the toggles
+	 */
+	private ILayerListener layerListener;
+
+
+	private Adapter changeAxisProvider;
+
+	private AdapterImpl changeAxisProviderHistory;
+
+
+	/**
+	 * the listener on the table cells
+	 */
+	private Adapter tableCellsListener;
+
+	private BiMap<CellMapKey, Cell> cellsMap;
+
+	/**
+	 * the local preference store for the table
+	 */
+	private PreferenceStore localPreferenceStore;
+
+
+	// fields used for refresh
+	private Runnable refreshRunnable;
+
+	/** Flag to avoid reentrant call to refresh. */
+	private AtomicBoolean isRefreshing = new AtomicBoolean(false);
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param rawModel
+	 *
+	 *            the model of the managed table
+	 */
+	public NattableModelManager(final Table rawModel) {
+		this(rawModel, new ObjectsSelectionExtractor());
+	}
+
+	/**
+	 * 
+	 * Constructor.
+	 *
+	 * @param rawModel
+	 *            the table model
+	 * @param selectionExtractor
+	 *            the selection extrator
+	 */
+	public NattableModelManager(final Table rawModel, final ISelectionExtractor selectionExtractor) {
+		super(rawModel, selectionExtractor);
+
+		this.rowProvider = rawModel.getCurrentRowAxisProvider();
+		this.columnProvider = rawModel.getCurrentColumnAxisProvider();
+		this.verticalElements = createVerticalElementList();
+		this.horizontalElements = createHorizontalElementList();
+
+		this.cellsMap = HashBiMap.create();
+
+		this.invertAxisListener = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(Notification msg) {
+				if (msg.getEventType() == Notification.SET) {
+					final Object oldValue = msg.getOldValue();
+					final Object newValue = msg.getNewValue();
+					if (oldValue != null && newValue != null) {
+						if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_InvertAxis()) {
+							invertJavaObject();
+
+							// use the method to refresh/merge the table using the appointed values saved in the model.notation
+							resizeAxis();
+							resizeHeader();
+							mergeTable();
+							// for the fun of it!
+							// in fact it is to fix the test org.eclipse.papyrus.sysml.nattable.requirement.tests.tests.RevealRequirementTableTest.test6SelectMultipleElementsInvertAxisAllColumns()
+							// it is a work around and not really a nice fix, because I don't understand the bug...
+							getBodyLayerStack().getRowHideShowLayer().showAllRows();
+							getBodyLayerStack().getColumnHideShowLayer().showAllColumns();
+
+						}
+					}
+				}
+			}
+		};
+
+		rawModel.eAdapters().add(this.invertAxisListener);
+		init();
+
+		changeAxisProvider = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(final Notification msg) {
+				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_CurrentColumnAxisProvider() || msg.getFeature() == NattablePackage.eINSTANCE.getTable_CurrentRowAxisProvider()) {
+					if (msg.getNewValue() != null) {
+						Display.getCurrent().asyncExec(new Runnable() {
+
+							@Override
+							public void run() {
+								init();
+								refreshNatTable();
+							}
+						});
+					}
+				}
+			}
+		};
+
+		changeAxisProviderHistory = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(final Notification msg) {
+				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_ColumnAxisProvidersHistory() || msg.getFeature() == NattablePackage.eINSTANCE.getTable_RowAxisProvidersHistory()) {
+					if (msg.getNewValue() != null) {
+						Display.getCurrent().asyncExec(new Runnable() {
+
+							@Override
+							public void run() {
+								init();
+							}
+						});
+					}
+				}
+			}
+
+		};
+
+		rawModel.eAdapters().add(changeAxisProvider);
+		tableCellsListener = new AdapterImpl() {
+
+			@Override
+			public void notifyChanged(final Notification msg) {
+				if (msg.getFeature() == NattablePackage.eINSTANCE.getTable_Cells()) {
+					updateCellMap(msg);
+				}
+			}
+		};
+		rawModel.eAdapters().add(tableCellsListener);
+
+		addListeners();
+	}
+
+	private ListEventListener<Object> listEventListener;
+
+	/**
+	 * add required listener
+	 */
+	protected void addListeners() {
+		this.listEventListener = new ListEventListener<Object>() {
+
+			/**
+			 * 
+			 * @param listChanges
+			 */
+			@Override
+			public void listChanged(ListEvent<Object> listChanges) {
+				manageEventListChanges(listChanges);
+			}
+
+		};
+		EventList<?> rowsList = (EventList<?>) getRowElementsList();
+		EventList<?> columnsList = (EventList<?>) getColumnElementsList();
+		rowsList.addListEventListener(this.listEventListener);
+		columnsList.addListEventListener(this.listEventListener);
+	}
+
+	/**
+	 * 
+	 * @param listChanges
+	 *            manage the list events
+	 */
+	private void manageEventListChanges(ListEvent<Object> listChanges) {
+		EventList<?> sourceList = listChanges.getSourceList();
+		CellEditorDeclaration declaration = TableHelper.getCellEditorDeclaration(this);
+		boolean needConfiguration = false;
+		if (CellEditorDeclaration.COLUMN == declaration && sourceList == getColumnElementsList()) {
+			needConfiguration = true;
+		}
+		if (CellEditorDeclaration.ROW == declaration && sourceList == getRowElementsList()) {
+			needConfiguration = true;
+		}
+		if (needConfiguration) {
+			configureCellAxisEditor();
+			configureFilters();
+			refreshNatTable();
+		}
+	}
+
+	/**
+	 * remove required listener
+	 */
+	protected void removeListeners() {
+		EventList<?> rowsList = (EventList<?>) getRowElementsList();
+		EventList<?> columnsList = (EventList<?>) getColumnElementsList();
+		rowsList.removeListEventListener(this.listEventListener);
+		columnsList.removeListEventListener(this.listEventListener);
+	}
+
+
+	/**
+	 *
+	 * @return
+	 * 		the new list to use for vertical element
+	 */
+	protected List<Object> createVerticalElementList() {
+		this.basicVerticalList = GlazedLists.eventList(new ArrayList<Object>());
+		// it required than vertical element is a filter list -> warning to invert axis?
+		this.verticalFilterList = new FilterList<Object>(this.basicVerticalList);
+		return this.verticalFilterList;
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		the new list to use for horizontal element
+	 */
+	protected List<Object> createHorizontalElementList() {
+		this.basicHorizontalList = GlazedLists.eventList(new ArrayList<Object>());
+		FilterList<Object> filteredList = new FilterList<Object>(this.basicHorizontalList);
+		this.horizontalFilterList = filteredList;
+		return this.horizontalFilterList;
+	}
+
+
+	@Override
+	public NatTable createNattable(Composite parent, int style, IWorkbenchPartSite site) {
+		updateCellMap(null);
+		final NatTable nattable = super.createNattable(parent, style, site);
+		this.refreshListener = new CommandStackListener() {
+
+			/**
+			 *
+			 * @see org.eclipse.emf.common.command.CommandStackListener#commandStackChanged(java.util.EventObject)
+			 *
+			 * @param event
+			 */
+			@Override
+			public void commandStackChanged(EventObject event) {
+				// we refresh the table after each command, only when it is visible
+				// its allows to refresh the text and the appearance of the table
+				// this refresh doesn't manage the add/remove axis
+				Display.getDefault().asyncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						if (nattable != null && !nattable.isDisposed() && nattable.isVisible()) {
+							nattable.doCommand(new VisualRefreshCommand());
+						}
+					}
+				});
+
+			}
+		};
+
+		getContextEditingDomain().getCommandStack().addCommandStackListener(this.refreshListener);
+		if (getTableEditingDomain() != null && getTableEditingDomain() != getContextEditingDomain()) {
+			getTableEditingDomain().getCommandStack().addCommandStackListener(this.refreshListener);
+		}
+		this.focusListener = new FocusListener() {
+
+			@Override
+			public void focusLost(FocusEvent e) {
+				// nothing to do
+			}
+
+			@Override
+			public void focusGained(FocusEvent e) {
+				updateToggleActionState();
+			}
+		};
+		nattable.addFocusListener(this.focusListener);
+
+		this.layerListener = new ILayerListener() {
+
+			@Override
+			public void handleLayerEvent(ILayerEvent event) {
+				updateToggleActionState();
+			}
+		};
+		nattable.addLayerListener(layerListener);
+
+		updateToggleActionState();// required, because the focus listener is not notified just after the creation of the widget
+		return nattable;
+	}
+
+	/**
+	 * this command update the status of the toggle actions
+	 */
+	@Override
+	protected void updateToggleActionState() {
+		super.updateToggleActionState();
+		final ICommandService commandService = EclipseCommandUtils.getCommandService();
+		if (commandService != null) {
+
+			final AbstractHeaderAxisConfiguration columnAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisConfigurationUsedInTable(getTable());
+			final AbstractHeaderAxisConfiguration rowAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(getTable());
+			// update the header configuration
+			org.eclipse.core.commands.Command command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISPLAY_INDEX_ID);
+			updateToggleCommandState(command, columnAxisConfiguration.isDisplayIndex());
+
+			command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISPLAY_LABEL_ID);
+			updateToggleCommandState(command, columnAxisConfiguration.isDisplayLabel());
+
+			command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISPLAY_INDEX_STYLE_ID);
+			updateRadioCommandState(command, columnAxisConfiguration.getIndexStyle().getLiteral());
+
+			command = commandService.getCommand(CommandIds.COMMAND_ROW_DISPLAY_INDEX_ID);
+			updateToggleCommandState(command, rowAxisConfiguration.isDisplayIndex());
+
+			command = commandService.getCommand(CommandIds.COMMAND_ROW_DISPLAY_LABEL_ID);
+			updateToggleCommandState(command, rowAxisConfiguration.isDisplayLabel());
+
+			command = commandService.getCommand(CommandIds.COMMAND_ROW_DISPLAY_INDEX_STYLE_ID);
+			updateRadioCommandState(command, rowAxisConfiguration.getIndexStyle().getLiteral());
+
+
+			// update the label header configuration
+			final List<ILabelProviderConfiguration> columnLabelConfigurations = columnAxisConfiguration.getOwnedLabelConfigurations();
+			final List<ILabelProviderConfiguration> rowLabelConfigurations = rowAxisConfiguration.getOwnedLabelConfigurations();
+			for (final ILabelProviderConfiguration current : columnLabelConfigurations) {
+				if (current instanceof ObjectLabelProviderConfiguration) {
+					final ObjectLabelProviderConfiguration labelConfig = (ObjectLabelProviderConfiguration) current;
+					command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_DISPLAY_ICON);
+					updateToggleCommandState(command, labelConfig.isDisplayIcon());
+
+					command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_DISPLAY_LABEL);
+					updateToggleCommandState(command, labelConfig.isDisplayLabel());
+
+					if (labelConfig instanceof FeatureLabelProviderConfiguration) {
+						final FeatureLabelProviderConfiguration labelFeatureConf = (FeatureLabelProviderConfiguration) labelConfig;
+						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_IS_DERIVED);
+						updateToggleCommandState(command, labelFeatureConf.isDisplayIsDerived());
+
+						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_MULTIPLICITY);
+						updateToggleCommandState(command, labelFeatureConf.isDisplayMultiplicity());
+
+						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_TYPE);
+						updateToggleCommandState(command, labelFeatureConf.isDisplayType());
+
+
+						command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_NAME);
+						updateToggleCommandState(command, labelFeatureConf.isDisplayName());
+					}
+				}
+			}
+
+			for (final ILabelProviderConfiguration current : rowLabelConfigurations) {
+				if (current instanceof ObjectLabelProviderConfiguration) {
+					final ObjectLabelProviderConfiguration labelConfig = (ObjectLabelProviderConfiguration) current;
+
+					command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_DISPLAY_ICON);
+					updateToggleCommandState(command, labelConfig.isDisplayIcon());
+
+					command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_DISPLAY_LABEL);
+					updateToggleCommandState(command, labelConfig.isDisplayLabel());
+
+					if (labelConfig instanceof FeatureLabelProviderConfiguration) {
+						final FeatureLabelProviderConfiguration labelFeatureConf = (FeatureLabelProviderConfiguration) labelConfig;
+						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_IS_DERIVED);
+						updateToggleCommandState(command, labelFeatureConf.isDisplayIsDerived());
+
+						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_MULTIPLICITY);
+						updateToggleCommandState(command, labelFeatureConf.isDisplayMultiplicity());
+
+						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_TYPE);
+						updateToggleCommandState(command, labelFeatureConf.isDisplayType());
+
+						command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_FEATURE_DISPLAY_NAME);
+						updateToggleCommandState(command, labelFeatureConf.isDisplayName());
+					}
+				}
+			}
+
+			// update the property IMasterObjectAxisProvider#disconnectslave
+			if (columnProvider instanceof ISlaveAxisProvider) {
+				command = commandService.getCommand(CommandIds.COMMAND_ROW_DISCONNECT_SLAVE);
+				updateToggleCommandState(command, ((IMasterAxisProvider) rowProvider).isDisconnectSlave());
+			}
+
+			if (rowProvider instanceof ISlaveAxisProvider) {
+				command = commandService.getCommand(CommandIds.COMMAND_COLUMN_DISCONNECT_SLAVE);
+				updateToggleCommandState(command, ((IMasterAxisProvider) columnProvider).isDisconnectSlave());
+			}
+
+			// we update the state for the invert axis command
+			command = commandService.getCommand(CommandIds.COMMAND_INVERT_AXIS);
+			updateToggleCommandState(command, getTable().isInvertAxis());
+
+			// updates the state of each merge actions commands
+			command = commandService.getCommand(CommandIds.COMMAND_MERGE_ROWS);
+			updateToggleCommandState(command, getToggleStateAllRows());
+
+			command = commandService.getCommand(CommandIds.COMMAND_MERGE_COLUMNS);
+			updateToggleCommandState(command, getToggleStateAllColumns());
+
+			command = commandService.getCommand(CommandIds.COMMAND_MERGE_SELECTED_ROWS);
+			updateToggleCommandState(command, getToggleStateSelectedRows());
+
+			command = commandService.getCommand(CommandIds.COMMAND_MERGE_SELECTED_COLUMNS);
+			updateToggleCommandState(command, getToggleStateSelectedColumns());
+
+		} else {
+			throw new RuntimeException(String.format("The Eclipse service %s has not been found", ICommandService.class)); //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 *
+	 * @param command
+	 *            an eclipse command
+	 * @param newValue
+	 *            the new boolean value to set to the state of this command
+	 */
+	private void updateToggleCommandState(final org.eclipse.core.commands.Command command, final boolean newValue) {
+		EclipseCommandUtils.updateToggleCommandState(command, newValue);
+	}
+
+
+	/**
+	 *
+	 * @param command
+	 *            an eclispe command
+	 * @param newValue
+	 *            the new value to set to the state of this command
+	 */
+	protected void updateRadioCommandState(final org.eclipse.core.commands.Command command, final Object newValue) {
+		EclipseCommandUtils.updateRadioCommandState(command, newValue);
+	}
+
+	public void invertJavaObject() {
+		getRowSortModel().clear();// we clear the sort model
+		AbstractAxisProvider newColumProvider = this.rowProvider;
+		AbstractAxisProvider newRowProvider = this.columnProvider;
+		List<Object> newVerticalElementList = this.horizontalElements;
+		List<Object> newHorizontalElementList = this.verticalElements;
+		ICompositeAxisManager newRowManager = this.columnManager;
+		ICompositeAxisManager newColumnManager = this.rowManager;
+
+		NattableModelManager.this.columnProvider = newColumProvider;
+		NattableModelManager.this.rowProvider = newRowProvider;
+
+		NattableModelManager.this.verticalElements = newVerticalElementList;
+		NattableModelManager.this.horizontalElements = newHorizontalElementList;
+
+		EventList<Object> newHorizontalBasicList = this.basicVerticalList;
+		EventList<Object> newVerticalBasicList = this.basicHorizontalList;
+
+		FilterList<Object> newVerticalFilterLilst = this.horizontalFilterList;
+		FilterList<Object> newHorizontalFilterList = this.verticalFilterList;
+
+		this.basicVerticalList = newVerticalBasicList;
+		this.basicHorizontalList = newHorizontalBasicList;
+		this.horizontalFilterList = newHorizontalFilterList;
+		this.verticalFilterList = newVerticalFilterLilst;
+
+
+		NattableModelManager.this.rowManager = newRowManager;
+		NattableModelManager.this.columnManager = newColumnManager;
+		this.rowManager.setAxisComparator(null);
+		this.columnManager.setAxisComparator(null);
+
+		updateToggleActionState();
+
+		configureCellAxisEditor();
+		configureFilters();
+		refreshNatTable();
+	}
+
+	public EventList<Object> getHorizontalBasicEventList() {
+		return this.basicHorizontalList;
+	}
+
+	public FilterList<Object> getHorizontalFilterEventList() {
+		return this.horizontalFilterList;
+	}
+
+	public FilterList<Object> getVerticalFilterList() {
+		return this.verticalFilterList;
+	}
+
+	public void resizeAxis() {
+		initTableAxis();
+		refreshNatTable();
+	}
+
+	public void resizeHeader() {
+		initTableHeaders();
+		refreshNatTable();
+	}
+
+	public void mergeTable() {
+		initTableMerge();
+		refreshNatTable();
+	}
+
+	/**
+	 * create the line and the columns managers
+	 */
+	protected void init() {
+		if (this.columnManager != null) {
+			this.columnManager.dispose();
+		}
+		if (this.rowManager != null) {
+			this.rowManager.dispose();
+		}
+		this.columnProvider = getTable().getCurrentColumnAxisProvider();
+		this.rowProvider = getTable().getCurrentRowAxisProvider();
+		this.columnManager = createAxisManager(getTable().getTableConfiguration().getColumnHeaderAxisConfiguration().getAxisManagers(), getTable().getCurrentColumnAxisProvider(), true);
+		this.rowManager = createAxisManager(getTable().getTableConfiguration().getRowHeaderAxisConfiguration().getAxisManagers(), getTable().getCurrentRowAxisProvider(), false);
+
+		boolean allIsSlave = this.columnManager.isSlave() && this.rowManager.isSlave();
+		Assert.isTrue(!allIsSlave, Messages.NattableModelManager_AtLeastOfOneTheAxisManagerMustBeAMaster);
+	}
+
+	/**
+	 *
+	 * @param ids
+	 *            the ids of the axis manager to use
+	 * @param contentProvider
+	 *            the content provider in the model
+	 * @return the created axis manager to use to manage the {@link IAxisContentsProvider}
+	 */
+	protected ICompositeAxisManager createAxisManager(final List<AxisManagerRepresentation> representations, final AbstractAxisProvider contentProvider, final boolean columnAxisManager) {
+		final ICompositeAxisManager compositeAxisManager = new CompositeAxisManager();
+		final List<IAxisManager> managers = new ArrayList<IAxisManager>();
+		for (AxisManagerRepresentation current : representations) {
+			final IAxisManager manager = AxisManagerFactory.INSTANCE.getAxisManager(current);
+			assert manager != null;
+			manager.init(this, current, contentProvider);
+			managers.add(manager);
+		}
+		compositeAxisManager.init(this, null, contentProvider);
+		compositeAxisManager.setSubAxisManager(managers);
+		return compositeAxisManager;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.ui.services.IDisposable#dispose()
+	 *
+	 */
+	@Override
+	public void dispose() {
+		if (this.tableEditingDomain != null) {
+			if (this.tableEditingDomain.getCommandStack() != null) {
+				this.tableEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);
+			}
+			if (this.tableEditingDomain != null) {
+				this.tableEditingDomain.removeResourceSetListener(resourceSetListener);
+			}
+
+		}
+
+		if (this.contextEditingDomain != null) {
+			if (this.contextEditingDomain.getCommandStack() != null) {
+				this.contextEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);
+			}
+			if (this.contextEditingDomain != null) {
+				this.contextEditingDomain.removeResourceSetListener(resourceSetListener);
+			}
+		}
+		this.columnManager.dispose();
+		this.rowManager.dispose();
+		Table table = getTable();
+		if (table != null && this.tableCellsListener != null) {
+			table.eAdapters().remove(this.tableCellsListener);
+		}
+		if (this.cellsMap != null) {
+			this.cellsMap.clear();
+		}
+		if (this.natTable != null) {
+			natTable.removeLayerListener(layerListener);
+		}
+
+		removeListeners();
+		super.dispose();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#addRows(java.util.Collection)
+	 *
+	 * @param objectsToAdd
+	 *            the list of the objects to add in rows
+	 */
+	@Override
+	public void addRows(final Collection<Object> objectsToAdd) {
+		final TransactionalEditingDomain domain = getContextEditingDomain();
+		final Command cmd = getAddRowElementCommand(objectsToAdd);
+		if (cmd != null && cmd.canExecute()) {
+			domain.getCommandStack().execute(cmd);
+		}
+	}
+
+	/**
+	 * called when the manager is used vertically
+	 */
+	@Override
+	public int getColumnCount() {
+		return this.getColumnElementsList().size();
+	}
+
+	/**
+	 * called when the manager is used horizontally
+	 */
+
+	@Override
+	public int getRowCount() {
+		return this.getRowElementsList().size();
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#addColumns(java.util.Collection)
+	 *
+	 * @param objectsToAdd
+	 *            the list of the objects to add in columns
+	 */
+	@Override
+	public void addColumns(final Collection<Object> objectsToAdd) {
+		final TransactionalEditingDomain domain = getContextEditingDomain();
+		final Command cmd = getAddColumnElementCommand(objectsToAdd);
+		if (cmd != null && cmd.canExecute()) {
+			domain.getCommandStack().execute(cmd);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#removeColumns(java.util.Collection)
+	 *
+	 * @param objetsToRemove
+	 */
+	@Override
+	public void removeColumns(Collection<Object> objetsToRemove) {
+		final TransactionalEditingDomain domain = getContextEditingDomain();
+		final Command cmd = getDestroyColumnElementCommand(objetsToRemove);
+		if (cmd != null && cmd.canExecute()) {
+			domain.getCommandStack().execute(cmd);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#removeRows(java.util.Collection)
+	 *
+	 * @param objectsToRemove
+	 */
+	@Override
+	public void removeRows(Collection<Object> objectsToRemove) {
+		final TransactionalEditingDomain domain = getContextEditingDomain();
+		final Command cmd = getDestroyRowElementCommand(objectsToRemove);
+		if (cmd != null && cmd.canExecute()) {
+			domain.getCommandStack().execute(cmd);
+		}
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getBodyDataProvider()
+	 *
+	 * @return the data provider for the body of the table
+	 */
+	@Override
+	public IDataProvider getBodyDataProvider() {
+		return this;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.nebula.widgets.nattable.data.IDataProvider#getDataValue(int, int)
+	 *
+	 * @param columnIndex
+	 *            the index of the column
+	 * @param rowIndex
+	 *            the index of the row
+	 * @return the contents to display in the cell localted to columnIndex and
+	 *         rowIndex
+	 */
+	@Override
+	public Object getDataValue(final int columnIndex, final int rowIndex) {
+		final Object row;
+		final Object column;
+		final Object obj1 = this.verticalElements.get(columnIndex);
+		final Object obj2 = this.horizontalElements.get(rowIndex);
+		if (getTable().isInvertAxis()) {
+			column = obj2;
+			row = obj1;
+		} else {
+			row = obj2;
+			column = obj1;
+		}
+		return CellManagerFactory.INSTANCE.getCrossValue(column, row, this);
+	}
+
+	@Override
+	public void setDataValue(final int columnIndex, final int rowIndex, final Object newValue) {
+		final Object row;
+		final Object column;
+		final Object obj1 = this.verticalElements.get(columnIndex);
+		final Object obj2 = this.horizontalElements.get(rowIndex);
+		if (getTable().isInvertAxis()) {
+			column = obj2;
+			row = obj1;
+		} else {
+			row = obj2;
+			column = obj1;
+		}
+		CellManagerFactory.INSTANCE.setCellValue(getContextEditingDomain(), column, row, newValue, this);
+	}
+
+	/**
+	 * refresh NatTable (asyncExec)
+	 */
+	public void refreshNatTable() {
+		// This refresh code has been duplicated from the refresh of the ModelExplorer (class ModelExplorerView)
+		final Runnable schedule;
+		if (this.natTable != null && !this.natTable.isDisposed()) {
+			synchronized (this) {
+				if (refreshRunnable == null) {
+					// No refresh is yet pending. Schedule one
+					schedule = createRefreshRunnable();
+					refreshRunnable = schedule;
+				} else {
+					schedule = null;
+				}
+			}
+
+			if (schedule != null) {
+				Control control = this.natTable;
+				Display display = ((control == null) || control.isDisposed()) ? null : control.getDisplay();
+
+				if (display != null) {
+					// Don't need to schedule a refresh if we have no control or it's disposed
+					display.asyncExec(schedule);
+				}
+			}
+		}
+	}
+
+	/**
+	 *
+	 * @return
+	 * 		a new runnable for the refreash action
+	 */
+	private Runnable createRefreshRunnable() {
+		return new Runnable() {
+
+			@Override
+			public void run() {
+				// Only run if I'm still pending
+				synchronized (NattableModelManager.this) {
+					if (refreshRunnable != this) {
+						return;
+					}
+
+					refreshRunnable = null;
+				}
+
+				refreshInUIThread();
+			}
+		};
+	}
+
+	/**
+	 * refresh the view.
+	 */
+	protected void refreshInUIThread() {
+		// Need to refresh, even if (temporarily) invisible
+		// (Better alternative?: store refresh event and execute once visible again)
+		if (this.natTable != null && this.natTable.isDisposed()) {
+			return;
+		}
+
+		// avoid reentrant call
+		// Refresh only of we are not already refreshing.
+		if (isRefreshing.compareAndSet(false, true)) {
+			this.natTable.refresh();
+			isRefreshing.set(false);
+		}
+	}
+
+	/**
+	 *
+	 * @param axis
+	 *            the axis for which must refresh the contents
+	 */
+	public void updateAxisContents(final AbstractAxisProvider axis) {
+
+		try {
+			getContextEditingDomain().runExclusive(new Runnable() {
+
+				@Override
+				public void run() {
+					Display.getDefault().syncExec(new Runnable() {
+
+						@Override
+						public void run() {
+							if (NattableModelManager.this.natTable != null && !NattableModelManager.this.natTable.isDisposed()) {
+								if (NattableModelManager.this.getTable() != null && NattableModelManager.this.getTable().getTableConfiguration() != null) {
+									if (axis == NattableModelManager.this.columnProvider) {
+										updateColumnContents();
+										NattableModelManager.this.getRowSortModel().updateSort();
+									} else {
+										updateRowContents();
+									}
+								}
+							}
+						}
+					});
+
+				}
+
+			});
+		} catch (InterruptedException e) {
+			Activator.log.error(e);
+		}
+
+	}
+
+	/**
+	 * refresh the row contents
+	 */
+	private void updateRowContents() {
+		NattableModelManager.this.rowManager.updateAxisContents();
+		CellEditorDeclaration declaration = getCellEditorDeclarationToUse(getTable());
+		if (declaration.equals(CellEditorDeclaration.ROW)) {
+			// configureNatTable(); : see bug 463058: [Table 2] Invert Axis + add/remove columns break the display of the table
+			refreshNatTable();
+		} else {
+			refreshNatTable();
+		}
+	}
+
+
+
+	/**
+	 * refresh the column contents
+	 */
+	private void updateColumnContents() {
+		NattableModelManager.this.columnManager.updateAxisContents();
+		CellEditorDeclaration declaration = getCellEditorDeclarationToUse(getTable());
+		if (declaration.equals(CellEditorDeclaration.COLUMN)) {
+			// configureNatTable(); : see bug 463058: [Table 2] Invert Axis + add/remove columns break the display of the table
+			refreshNatTable();
+		} else {
+			refreshNatTable();
+		}
+	}
+
+	/**
+	 *
+	 * @param table
+	 *            the table
+	 * @return
+	 * 		the celleditor declaration to use according to the table configuration and {@link Table#isInvertAxis()}
+	 */
+	private CellEditorDeclaration getCellEditorDeclarationToUse(final Table table) {
+		CellEditorDeclaration declaration = table.getTableConfiguration().getCellEditorDeclaration();
+		if (getTable().isInvertAxis()) {
+			if (declaration.equals(CellEditorDeclaration.COLUMN)) {
+				declaration = CellEditorDeclaration.ROW;
+			} else if (declaration.equals(CellEditorDeclaration.ROW)) {
+				declaration = CellEditorDeclaration.COLUMN;
+			}
+		}
+		return declaration;
+	}
+
+	@Override
+	public List<Object> getColumnElementsList() {
+		return this.verticalElements;
+	}
+
+	@Override
+	public List<Object> getRowElementsList() {
+		return this.horizontalElements;
+	}
+
+
+	@Override
+	public boolean canInsertRow(Collection<Object> objectsToAdd, int index) {
+		return this.rowManager.canInsertAxis(objectsToAdd, index);
+	}
+
+	@Override
+	public boolean canInsertColumns(Collection<Object> objectsToAdd, int index) {
+		return this.columnManager.canInsertAxis(objectsToAdd, index);
+	}
+
+	@Override
+	public boolean canDropColumnsElement(Collection<Object> objectsToAdd) {
+		return this.columnManager.canDropAxisElement(objectsToAdd);
+	}
+
+	@Override
+	public boolean canDropRowElement(Collection<Object> objectsToAdd) {
+		return this.rowManager.canDropAxisElement(objectsToAdd);
+	}
+
+	@Override
+	public void insertRows(Collection<Object> objectsToAdd, int index) {
+		this.rowManager.getInsertAxisCommand(objectsToAdd, index);
+
+	}
+
+	@Override
+	public void insertColumns(Collection<Object> objectsToAdd, int index) {
+		this.columnManager.getInsertAxisCommand(objectsToAdd, index);
+	}
+
+	@Override
+	public Object getColumnElement(int index) {
+		if (index < 0 || index >= this.verticalElements.size()) {
+			return null;
+		}
+		return this.verticalElements.get(index);
+	}
+
+	@Override
+	public Object getRowElement(int index) {
+		if (index < 0 || index >= this.horizontalElements.size()) {
+			return null;
+		}
+		return this.horizontalElements.get(index);
+	}
+
+	public List<Object> getElementsList(AbstractAxisProvider axisProvider) {
+		if (axisProvider == this.columnProvider) {
+			return this.verticalElements;
+		} else if (axisProvider == this.rowProvider) {
+			return this.horizontalElements;
+		}
+		return null;
+	}
+
+	@Override
+	public boolean canMoveRows() {
+		return this.rowManager.canMoveAxis();
+	}
+
+	@Override
+	public boolean canMoveColumns() {
+		return this.columnManager.canMoveAxis();
+	}
+
+	@Override
+	public void moveColumnElement(final Object axisToMove, final int newIndex) {
+		this.columnManager.moveAxis(axisToMove, newIndex);
+	}
+
+	// not tested
+	@Override
+	public void moveRowElement(final Object axisToMove, final int newIndex) {
+		this.rowManager.moveAxis(axisToMove, newIndex);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#invertAxis()
+	 *
+	 */
+	@Override
+	public void invertAxis() {
+		final CompoundCommand cmd = new CompoundCommand(Messages.NattableModelManager_SwitchLinesAndColumns);
+		final TransactionalEditingDomain domain = getContextEditingDomain();
+		boolean oldValue = getTable().isInvertAxis();
+		if (canInvertAxis()) {
+			Command tmp = new SetCommand(domain, getTable(), NattablePackage.eINSTANCE.getTable_InvertAxis(), !oldValue);
+			cmd.append(tmp);
+			domain.getCommandStack().execute(cmd);
+		}
+
+		// use the method to refresh the table using the appointed values saved in the model.notation
+		initTableAxis();
+		initTableHeaders();
+		initTableMerge();
+	}
+
+	@Override
+	public boolean canInvertAxis() {
+		return this.columnManager.canBeUsedAsRowManager() && this.rowManager.canBeUsedAsColumnManager();
+	}
+
+	@Override
+	public boolean canCreateRowElement(String elementType) {
+		return this.rowManager.canCreateAxisElement(elementType);
+	}
+
+	@Override
+	public boolean canCreateColumnElement(String elementType) {
+		return this.columnManager.canCreateAxisElement(elementType);
+	}
+
+	@Override
+	public Command getAddRowElementCommand(Collection<Object> objectsToAdd) {
+		final TransactionalEditingDomain domain = getContextEditingDomain();
+		final CompoundCommand cmd = new CompoundCommand(Messages.NattableModelManager_AddRowCommand);
+		Command tmp = this.rowManager.getAddAxisCommand(domain, objectsToAdd);
+		if (tmp != null) {
+			cmd.append(tmp);
+		}
+		final AbstractAxisProvider rowsProvider = AxisUtils.getAxisProviderUsedForRows(this);
+		final AbstractAxisProvider columnsProvider = AxisUtils.getAxisProviderUsedForColumns(this);
+		boolean addComplementaryAxis = rowsProvider instanceof IMasterAxisProvider && columnsProvider instanceof ISlaveAxisProvider && !((IMasterAxisProvider) rowsProvider).isDisconnectSlave();
+		if (addComplementaryAxis) {
+			tmp = this.columnManager.getComplementaryAddAxisCommand(domain, objectsToAdd);
+			if (tmp != null) {
+				cmd.append(tmp);
+			}
+		}
+		return cmd;
+	}
+
+	@Override
+	public Command getAddColumnElementCommand(Collection<Object> objectsToAdd) {
+		final TransactionalEditingDomain domain = getContextEditingDomain();
+		final CompoundCommand cmd = new CompoundCommand(Messages.NattableModelManager_AddColumnCommand);
+		Command tmp = this.columnManager.getAddAxisCommand(domain, objectsToAdd);
+		if (tmp != null) {
+			cmd.append(tmp);
+		}
+		final AbstractAxisProvider rowsProvider = AxisUtils.getAxisProviderUsedForRows(this);
+		final AbstractAxisProvider columnsProvider = AxisUtils.getAxisProviderUsedForColumns(this);
+		boolean addComplementaryAxis = columnsProvider instanceof IMasterAxisProvider && rowsProvider instanceof ISlaveAxisProvider && !((IMasterAxisProvider) columnsProvider).isDisconnectSlave();
+		if (addComplementaryAxis) {
+			tmp = this.rowManager.getComplementaryAddAxisCommand(domain, objectsToAdd);
+			if (tmp != null) {
+				cmd.append(tmp);
+			}
+		}
+		return cmd;
+	}
+
+	public Command getDestroyColumnElementCommand(Collection<Object> objectsToDestroy) {
+		final TransactionalEditingDomain domain = getContextEditingDomain();
+		final Command cmd = this.columnManager.getDestroyAxisCommand(domain, objectsToDestroy);
+		return cmd;
+	}
+
+	public Command getDestroyRowElementCommand(Collection<Object> objectsToDestroy) {
+		final TransactionalEditingDomain domain = getContextEditingDomain();
+		final Command cmd = this.rowManager.getDestroyAxisCommand(domain, objectsToDestroy);
+		return cmd;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getTableAxisElementProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	public ITableAxisElementProvider getTableAxisElementProvider() {
+		return this;
+	}
+
+	/**
+	 * When the axis manager is dynamic, we can't destroy axis
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canCreateDestroyColumnsAxis()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canCreateDestroyColumnsAxis() {
+		return !this.columnManager.isDynamic() && this.columnManager.createPossibleAxisContentProvider(true) != null;
+	}
+
+	/**
+	 * When the axis manager is dynamic, we can't destroy axis
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canCreateDestroyRowsAxis()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean canCreateDestroyRowsAxis() {
+		return !this.rowManager.isDynamic() && this.rowManager.createPossibleAxisContentProvider(true) != null;
+	}
+
+	/**
+	 *
+	 * @param serv
+	 *            the label provider service
+	 * @param editedAxisManager
+	 *            the manager used for the edited axis
+	 * @param secondAxisManager
+	 *            the manager used for the other axis
+	 * @param isEditingColumns
+	 *            boolean indicating if we are editing columns or rows
+	 */
+	private final void openCreateDestroyAxisManagerDialog(boolean isEditingColumns) {
+		final String dialogTitle;
+		final String dialogCheckBoxTootip;
+		final String dialogQuestion;
+
+		final IAxisManager editedAxisManager;
+		final IAxisManager secondAxisManager;
+		final String checkBoxMessage = Messages.NattableModelManager_DisconnectThisAxisManager;
+		if (isEditingColumns) {
+			dialogTitle = Messages.NattableModelManager_SelectColumns;
+			dialogCheckBoxTootip = Messages.NattableModelManager_DisableTheAutomaticAdditionOfColumnsWhenARowIsAdded;
+			dialogQuestion = String.format(Messages.NattableModelManager_TheCheckBoxHasNotBeenCheckedToAvoidAutomaticColumnAddition, checkBoxMessage);
+
+			editedAxisManager = columnManager;
+			secondAxisManager = rowManager;
+		} else {
+			dialogTitle = Messages.NattableModelManager_SelectRows;
+			dialogCheckBoxTootip = Messages.NattableModelManager_DisableTheAutomaticAdditionOfRowsWhenAColumnIsAdded;
+			dialogQuestion = String.format(Messages.NattableModelManager_TheCheckBoxHasNotBeenCheckedToAvoidAutomaticRowAddition, checkBoxMessage);
+
+			editedAxisManager = rowManager;
+			secondAxisManager = columnManager;
+		}
+		final LabelProviderService serv = this.natTable.getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		final ILabelProvider labelProvider = serv.getLabelProvider();
+		final AbstractAxisProvider editedAxisProvider = editedAxisManager.getRepresentedContentProvider();
+		final AbstractAxisProvider secondAxisProvider = secondAxisManager.getRepresentedContentProvider();
+		ReferenceSelector selector = new ReferenceSelector(true) {
+
+			@Override
+			public void createControls(Composite parent) {
+				super.createControls(parent);
+				this.treeViewer.setComparator(new ViewerComparator(new StringComparator()));// should always be string element
+			}
+		};
+		selector.setLabelProvider(labelProvider);
+
+		IStaticContentProvider provider = editedAxisManager.createPossibleAxisContentProvider(true);
+		if (provider != null) {
+			selector.setContentProvider(new FlattenableRestrictedFilteredContentProvider((IRestrictedContentProvider) provider, selector));
+			boolean canBeReorder = (!editedAxisManager.isDynamic()) && editedAxisManager.canMoveAxis();
+			final DisplayedAxisSelectorDialog dialog = new DisplayedAxisSelectorDialog(Display.getDefault().getActiveShell(), selector, dialogTitle, true, canBeReorder, -1);
+			boolean displayCheckBox = editedAxisProvider instanceof ISlaveAxisProvider;
+			dialog.setDisplayCheckBox(displayCheckBox);
+			boolean checkboxValue = secondAxisProvider instanceof IMasterAxisProvider && ((IMasterAxisProvider) secondAxisProvider).isDisconnectSlave();
+			if (displayCheckBox) {
+				dialog.setCheckBoxValues(checkBoxMessage, dialogCheckBoxTootip, checkboxValue);
+			}
+
+			dialog.setInformationDialogValues(Messages.NattableModelManager_DisconnectAxisManagerInformationDialogTitle, dialogQuestion);
+			dialog.setLabelProvider(labelProvider);
+			final List<Object> initialSelection = ((CompositeAxisManager) editedAxisManager).getAllManagedAxis(true);
+			dialog.setInitialElementSelections(new ArrayList<Object>(initialSelection));
+
+			int open = dialog.open();
+			if (open == Window.OK) {
+				Collection<Object> existingColumns = initialSelection;
+				ArrayList<Object> checkedColumns = new ArrayList<Object>();
+				final List<Object> result = Arrays.asList(dialog.getResult());
+				checkedColumns.addAll(result);
+
+				ArrayList<Object> columnsToAdd = new ArrayList<Object>(checkedColumns);
+				columnsToAdd.removeAll(existingColumns);
+				CompoundCommand compoundCommand = new CompoundCommand("Update Existing Axis Command"); //$NON-NLS-1$
+				if (columnsToAdd.size() > 0) {
+					Command addAxisElementCommand = null;
+					if (isEditingColumns) {
+						addAxisElementCommand = getAddColumnElementCommand(columnsToAdd);
+					} else {
+						addAxisElementCommand = getAddRowElementCommand(columnsToAdd);
+					}
+					compoundCommand.append(addAxisElementCommand);
+				}
+
+				ArrayList<Object> axisToDestroy = new ArrayList<Object>(existingColumns);
+				axisToDestroy.removeAll(checkedColumns);
+				if (axisToDestroy.size() > 0) {
+					Command destroyAxisElementCommand = null;
+					if (isEditingColumns) {
+						destroyAxisElementCommand = getDestroyColumnElementCommand(axisToDestroy);
+					} else {
+						destroyAxisElementCommand = getDestroyRowElementCommand(axisToDestroy);
+					}
+					compoundCommand.append(destroyAxisElementCommand);
+				}
+
+				final boolean newState = dialog.isChecked();
+				if (displayCheckBox && checkboxValue != newState) {
+					final TransactionalEditingDomain domain = getTableEditingDomain();
+					final IEditCommandRequest request = new SetRequest(domain, secondAxisProvider, NattableaxisproviderPackage.eINSTANCE.getIMasterAxisProvider_DisconnectSlave(), newState);
+					final IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(secondAxisProvider);
+					compoundCommand.append(new GMFtoEMFCommandWrapper(commandProvider.getEditCommand(request)));
+				}
+
+				if (canBeReorder) {
+					final Command setOrderCommand = ((ICompositeAxisManager) editedAxisManager).getSetNewAxisOrderCommand(result);
+					if (setOrderCommand != null) {
+						compoundCommand.append(setOrderCommand);
+					}
+				}
+				if (!compoundCommand.isEmpty()) {
+					getContextEditingDomain().getCommandStack().execute(compoundCommand);
+					updateToggleActionState();
+				}
+			}
+		} else {
+			MessageDialog.openInformation(Display.getDefault().getActiveShell(), Messages.NattableModelManager_CreateDestroyAxis, Messages.NattableModelManager_ActionNotYetSupported);
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openCreateDestroyRowsManagerDialog()
+	 *
+	 */
+	@Override
+	public void openCreateDestroyRowsManagerDialog() {
+		openCreateDestroyAxisManagerDialog(false);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openCreateDestroyColumnsManagerDialog()
+	 *
+	 */
+	@Override
+	public void openCreateDestroyColumnsManagerDialog() {
+		openCreateDestroyAxisManagerDialog(true);
+	}
+
+	@Override
+	public void sortColumnsByName(final boolean alphabeticOrder) {
+		this.columnManager.sortAxisByName(alphabeticOrder, this.natTable.getConfigRegistry());
+	}
+
+
+	@Override
+	public void sortRowsByName(final boolean alphabeticOrder) {
+		this.rowManager.sortAxisByName(alphabeticOrder, this.natTable.getConfigRegistry());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getVerticalAxisProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	public AbstractAxisProvider getVerticalAxisProvider() {
+		if (getTable().isInvertAxis()) {
+			return getTable().getCurrentRowAxisProvider();
+		} else {
+			return getTable().getCurrentColumnAxisProvider();
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getHorizontalAxisProvider()
+	 *
+	 * @return
+	 */
+	@Override
+	public AbstractAxisProvider getHorizontalAxisProvider() {
+		if (getTable().isInvertAxis()) {
+			return getTable().getCurrentColumnAxisProvider();
+		} else {
+			return getTable().getCurrentRowAxisProvider();
+		}
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canEditColumnHeader(int)
+	 *
+	 * @param evaluationContext
+	 * @return
+	 */
+	@Override
+	public boolean canEditColumnHeader(final NatEventData evaluationContext) {
+		return this.columnManager.canEditAxisHeader(evaluationContext);
+	}
+
+	/***
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#canEditRowHeader(org.eclipse.nebula.widgets.nattable.ui.NatEventData)
+	 *
+	 * @param eventData
+	 * @return
+	 */
+	@Override
+	public boolean canEditRowHeader(NatEventData evaluationContext) {
+		return this.rowManager.canEditAxisHeader(evaluationContext);
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openEditRowAliasDialog(org.eclipse.nebula.widgets.nattable.ui.NatEventData)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void openEditRowAliasDialog(NatEventData event) {
+		this.rowManager.openEditAxisAliasDialog(event, event.getNatTable().getRowIndexByPosition(event.getRowPosition()));
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#openEditColumnAliasDialog(org.eclipse.nebula.widgets.nattable.ui.NatEventData)
+	 *
+	 * @param event
+	 */
+	@Override
+	public void openEditColumnAliasDialog(NatEventData event) {
+		this.columnManager.openEditAxisAliasDialog(event, event.getNatTable().getColumnIndexByPosition(event.getColumnPosition()));
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getColumnAxisManager()
+	 *
+	 * @return
+	 */
+	@Override
+	public IAxisManager getColumnAxisManager() {
+		return this.columnManager;
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getRowAxisManager()
+	 *
+	 * @return
+	 */
+	@Override
+	public IAxisManager getRowAxisManager() {
+		return this.rowManager;
+	}
+
+
+	@Override
+	public void setTableName(String name) {
+		SetRequest setNameRequest = new SetRequest(getTable(), NattableconfigurationPackage.eINSTANCE.getTableNamedElement_Name(), name);
+		IElementEditService editService = ElementEditServiceUtils.getCommandProvider(getTable());
+		ICommand setNameCommand = editService.getEditCommand(setNameRequest);
+		getTableEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setNameCommand));
+	}
+
+
+	@Override
+	public String getTableName() {
+		return getTable().getName();
+	}
+
+
+	@Override
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+		if (adapter == NatTable.class) {
+			return this.natTable;
+		}
+		return super.getAdapter(adapter);
+	}
+
+	private void updateCellMap(final Notification notification) {
+		Job job = new Job("Update cells") { //$NON-NLS-1$
+
+			@Override
+			protected IStatus run(final IProgressMonitor monitor) {
+				if (notification == null) {
+					cellsMap.clear();
+					for (final Cell current : getTable().getCells()) {
+						final CellMapKey key = createCellMapKeyWaitingCellAxis(current);
+						cellsMap.put(key, current);
+					}
+				} else {
+					int eventType = notification.getEventType();
+					if (eventType == Notification.ADD) {
+						final Object object = notification.getNewValue();
+						if (object instanceof Cell) {
+							final Cell cell = (Cell) object;
+							final CellMapKey key = createCellMapKeyWaitingCellAxis(cell);
+							cellsMap.put(key, cell);
+						}
+					} else if (eventType == Notification.ADD_MANY) {
+						final Object coll = notification.getNewValue();
+
+						if (coll instanceof Collection<?>) {
+							final Iterator<?> iter = ((Collection<?>) coll).iterator();
+							while (iter.hasNext()) {
+								Object object = iter.next();
+								if (object instanceof Cell) {
+									final Cell cell = (Cell) object;
+									final CellMapKey key = createCellMapKeyWaitingCellAxis(cell);
+									cellsMap.put(key, cell);
+								}
+							}
+						}
+					} else if (eventType == Notification.REMOVE) {
+						Object oldCell = notification.getOldValue();
+						if (oldCell instanceof Cell) {
+							CellMapKey key = cellsMap.inverse().get(oldCell);
+							cellsMap.remove(key);
+						}
+					} else if (eventType == Notification.REMOVE_MANY) {
+						final Object coll = notification.getOldValue();
+
+						if (coll instanceof Collection<?>) {
+							final Iterator<?> iter = ((Collection<?>) coll).iterator();
+							while (iter.hasNext()) {
+								Object object = iter.next();
+								if (object instanceof Cell) {
+									final CellMapKey key = cellsMap.inverse().get(object);
+									cellsMap.remove(key);
+								}
+							}
+						}
+					}
+				}
+
+				return Status.OK_STATUS;
+			}
+		};
+		job.setUser(false);
+		job.setSystem(true);
+		job.addJobChangeListener(new JobChangeAdapter() {
+
+			@Override
+			public void done(IJobChangeEvent event) {
+				refreshNatTable();
+			}
+
+		});
+		job.schedule();
+
+
+		// resourceSetListener used to capture the event pertaining to the merge and resize actions
+		// these events can be used to undo/redo previous actions
+		resourceSetListener = new ResourceSetListener() {
+
+			@Override
+			public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
+				return null;
+			}
+
+			@Override
+			public void resourceSetChanged(ResourceSetChangeEvent event) {
+
+				for (final Notification notification : event.getNotifications()) {
+					// filter the events to only let through the changes on the current table resource
+					Table notifiedTable = findTable(notification);
+					if (getTable().equals(notifiedTable)) {
+
+						Display.getDefault().asyncExec(new Runnable() {
+
+							@Override
+							public void run() {
+								// already created booleanValues and intValues
+								if (notification.getNotifier() instanceof BooleanValueStyle) {
+									// as the filter already prevented any nonBooleanValueStyle, and therefore any non EObject, it can be cast without verification
+									EObject mergeContainer = ((EObject) notification.getNotifier()).eContainer();
+									if (mergeContainer instanceof AbstractHeaderAxisConfiguration || mergeContainer instanceof IAxis) {
+										mergeTable();
+									}
+								}
+								if (notification.getNotifier() instanceof IntValueStyle) {
+									EObject resizeContainer = ((EObject) notification.getNotifier()).eContainer();
+									if (resizeContainer instanceof AbstractHeaderAxisConfiguration) {
+										resizeHeader();
+									}
+									if (resizeContainer instanceof IAxis) {
+										resizeAxis();
+									}
+								}
+								// newly created booleanValues and intValues
+								if (notification.getNewValue() instanceof BooleanValueStyle) {
+									mergeTable();
+								}
+								if (notification.getNewValue() instanceof IntValueStyle) {
+									if (notification.getNotifier() instanceof IAxis) {
+										resizeAxis();
+									}
+									if (notification.getNotifier() instanceof AbstractHeaderAxisConfiguration) {
+										resizeHeader();
+									}
+								}
+								// reset to the default state using ctrl+z
+								if (notification.getNewValue() == null && notification.getOldValue() != null) {
+									mergeTable();
+									resizeAxis();
+									resizeHeader();
+								}
+							}
+						});
+					}
+				}
+			}
+
+			@Override
+			public boolean isPrecommitOnly() {
+				return false;
+			}
+
+			@Override
+			public boolean isPostcommitOnly() {
+				return false;
+			}
+
+			@Override
+			public boolean isAggregatePrecommitListener() {
+				return false;
+			}
+
+			@Override
+			public NotificationFilter getFilter() {
+				// this filter only lets through the notifications pertaining to the table
+				// the first three conditions handle the modification, the add and the remove of styles
+				// the last seven handle the modified or created objects containing those styles
+				return ((NotificationFilter.createEventTypeFilter(Notification.SET))
+						.or(NotificationFilter.createEventTypeFilter(Notification.ADD))
+						.or(NotificationFilter.createEventTypeFilter(Notification.REMOVE)))
+								.and((NotificationFilter.createNotifierTypeFilter(BooleanValueStyle.class))
+										.or(NotificationFilter.createNotifierTypeFilter(IntValueStyle.class))
+										.or(NotificationFilter.createNotifierTypeFilter(EObjectAxis.class))
+										.or(NotificationFilter.createNotifierTypeFilter(FeatureIdAxis.class))
+										.or(NotificationFilter.createNotifierTypeFilter(EStructuralFeatureAxis.class))
+										.or(NotificationFilter.createNotifierTypeFilter(LocalTableHeaderAxisConfiguration.class))
+										.or(NotificationFilter.createNotifierTypeFilter(Table.class)));
+				// return NotificationFilter.createNotifierTypeFilter(EObject.class);
+			}
+		};
+
+		if (getTableEditingDomain() != null && getTableEditingDomain() != getContextEditingDomain()) {
+			getTableEditingDomain().addResourceSetListener(resourceSetListener);
+		}
+
+	}
+
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getCell(java.lang.Object, java.lang.Object)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @return
+	 */
+	@Override
+	public Cell getCell(final Object columnElement, final Object rowElement) {
+		final CellMapKey key = new CellMapKey(columnElement, rowElement);
+		return this.cellsMap.get(key);
+	}
+
+	/**
+	 * This method allows to create a CellMapKey object waiting that required fields in the cell have been initialized
+	 *
+	 * @param cell
+	 *            a cell
+	 */
+	private CellMapKey createCellMapKeyWaitingCellAxis(final Cell cell) {
+		while (cell.getColumnWrapper() == null || cell.getRowWrapper() == null) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+				Activator.log.error(e);
+			}
+		}
+		while (cell.getColumnWrapper().getElement() == null || cell.getRowWrapper().getElement() == null) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+				Activator.log.error(e);
+			}
+		}
+		return new CellMapKey(cell.getColumnWrapper().getElement(), cell.getRowWrapper().getElement());
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getTablePreferenceStore()
+	 *
+	 * @return
+	 */
+	@Override
+	public PreferenceStore getTablePreferenceStore() {
+		return this.localPreferenceStore;
+	}
+
+	/**
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#setWorkspacePreferenceStore(org.eclipse.jface.preference.PreferenceStore)
+	 *
+	 * @param store
+	 */
+	@Override
+	public void setWorkspacePreferenceStore(final PreferenceStore store) {
+		this.localPreferenceStore = store;
+	}
+
+
+	// TODO : tmp class to externalize when the filter will works fine
+	public class PapyrusColumnAccesor implements IColumnAccessor<Object> {
+
+		/**
+		 * @see org.eclipse.nebula.widgets.nattable.data.IColumnAccessor#getDataValue(java.lang.Object, int)
+		 *
+		 * @param rowObject
+		 * @param columnIndex
+		 * @return
+		 */
+		@Override
+		public Object getDataValue(Object rowObject, int columnIndex) {
+			return CellManagerFactory.INSTANCE.getCrossValue(getColumnElement(columnIndex), rowObject, NattableModelManager.this);
+		}
+
+		/**
+		 * @see org.eclipse.nebula.widgets.nattable.data.IColumnAccessor#setDataValue(java.lang.Object, int, java.lang.Object)
+		 *
+		 * @param rowObject
+		 * @param columnIndex
+		 * @param newValue
+		 */
+		@Override
+		public void setDataValue(Object rowObject, int columnIndex, Object newValue) {
+			// TODO Auto-generated method stub
+
+		}
+
+		/**
+		 * @see org.eclipse.nebula.widgets.nattable.data.IColumnAccessor#getColumnCount()
+		 *
+		 * @return
+		 */
+		@Override
+		public int getColumnCount() {
+			// TODO Auto-generated method stub
+			return 0;
+		}
+
+	}
+
+	/**
+	 * @return
+	 * 		the filter strategy to use
+	 *
+	 */
+	@Override
+	protected IFilterStrategy<Object> createFilterStrategy() {
+		return new PapyrusFilterStrategy(this, new PapyrusColumnAccesor());
+		// TODO
+		// FIXME warning to invert axis
+		// return new PapyrusFilterStrategy(this, this.horizontalFilterList, new PapyrusColumnAccesor(), null);
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java
index 97c323d5c79..5b5c5d37812 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java
@@ -18,8 +18,6 @@ import java.util.List;
 
 import org.eclipse.core.commands.Command;
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.ResourceSetListener;
 import org.eclipse.emf.transaction.RollbackException;
 import org.eclipse.nebula.widgets.nattable.NatTable;
@@ -160,7 +158,9 @@ public class TreeNattableModelManager extends NattableModelManager implements IT
 			hideShowCategories(hiddenDepth, null);
 		}
 		this.hideShowCategoriesListener = new HideShowCategoriesTableListener(this);
-		getTableEditingDomain().addResourceSetListener(this.hideShowCategoriesListener);
+		if (null != getTableEditingDomain()) {
+			getTableEditingDomain().addResourceSetListener(this.hideShowCategoriesListener);
+		}
 		return nattable;
 	}
 
@@ -369,6 +369,28 @@ public class TreeNattableModelManager extends NattableModelManager implements IT
 		CollapseExpandActionHelper.doCollapseExpandAction(actionId, selectedAxis, getTableAxisElementProvider(), this.natTable);
 	}
 
+	/**
+	 * Modify the axis when it is disposed.
+	 * 
+	 * @param iAxis
+	 *            The list of axis.
+	 */
+	private void modifyAcisDeliver(final List<IAxis> iAxis) {
+		for (IAxis axis : iAxis) {
+			if (axis instanceof ITreeItemAxis) {
+				boolean isDelivering = axis.eDeliver();
+				if (isDelivering) {
+					// I suppose than it is not necessary to send notification here
+					axis.eSetDeliver(false);
+				}
+				((ITreeItemAxis) axis).getChildren().clear();
+				if (isDelivering) {
+					// I reset the initial value, because the model can be reopened
+					axis.eSetDeliver(true);
+				}
+			}
+		}
+	}
 
 	/**
 	 * @see org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager#dispose()
@@ -379,31 +401,21 @@ public class TreeNattableModelManager extends NattableModelManager implements IT
 		final List<IAxis> iAxis = getHorizontalAxisProvider().getAxis();
 
 		if (iAxis != null) {
-			//see bug 467706: [Table 2] Tree Table with no tree filling configuration on depth==0 can't be reopened
+			// see bug 467706: [Table 2] Tree Table with no tree filling configuration on depth==0 can't be reopened
 			// we need to remove the children which are not serialized from the root of the table, to be able to reopen
 			Runnable runnable = new Runnable() {
 
 				@Override
 				public void run() {
-					for (IAxis axis : iAxis) {
-						if (axis instanceof ITreeItemAxis) {
-							boolean isDelivering = axis.eDeliver();
-							if (isDelivering) {
-								// I suppose than it is not necessary to send notification here
-								axis.eSetDeliver(false);
-							}
-							((ITreeItemAxis) axis).getChildren().clear();
-							if (isDelivering) {
-								// I reset the initial value, because the model can be reopened
-								axis.eSetDeliver(true);
-							}
-						}
-					}
-
+					modifyAcisDeliver(iAxis);
 				}
 			};
 			try {
-				GMFUnsafe.write(getTableEditingDomain(), runnable);
+				if (null != getTableEditingDomain()) {
+					GMFUnsafe.write(getTableEditingDomain(), runnable);
+				} else {
+					modifyAcisDeliver(iAxis);
+				}
 			} catch (InterruptedException e) {
 				Activator.log.error(e);
 			} catch (RollbackException e) {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/ITreeItemAxisHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/ITreeItemAxisHelper.java
index edee34aff58..014f62cf0d9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/ITreeItemAxisHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tree/ITreeItemAxisHelper.java
@@ -1,144 +1,151 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- *

- * 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:

- *   CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.tree;

-

-import java.util.HashSet;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.transaction.RollbackException;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-

-/**

- * @author VL222926

- *

- */

-// TODO : refactore me to use IAxisFactory ?

-public class ITreeItemAxisHelper {

-

-	private ITreeItemAxisHelper() {

-		// to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param editingDomain

-	 *            the editing domain to use to create the ITreeItemAxis

-	 * @param parentAxis

-	 *            the parent axis to use for the created ITreeItemAxis

-	 * @param child

-	 *            the object to wrap in the created ITreeItemAxis

-	 * @param axisRepresentation

-	 *            the axis representation of the axis manager providing its ITreeItemAxis

-	 * @return

-	 *         the created {@link ITreeItemAxis}

-	 */

-	public static ITreeItemAxis createITreeItemAxis(final TransactionalEditingDomain editingDomain, final ITreeItemAxis parentAxis, final Object child, final AxisManagerRepresentation axisRepresentation) {

-		final ITreeItemAxis axis;

-		if (child instanceof EObject) {

-			axis = NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis();

-			((EObjectTreeItemAxis) axis).setElement((EObject) child);

-		} else {

-			axis = null;

-			throw new UnsupportedOperationException("The only managed case is EObject, others cases are not yet managed"); //$NON-NLS-1$

-		}

-

-		try {

-			GMFUnsafe.write(editingDomain, new Runnable() {

-

-				@Override

-				public void run() {

-					if (parentAxis != null) {

-						axis.setParent(parentAxis);

-					}

-					axis.setManager(axisRepresentation);

-				}

-			});

-		} catch (InterruptedException e) {

-			Activator.log.error(e);

-		} catch (RollbackException e) {

-			Activator.log.error(e);

-		}

-		return axis;

-	}

-

-	/**

-	 * This method to destroy an {@link ITreeItemAxis} from the model

-	 *

-	 * @param domain

-	 *            the editing domain to use to drestoy the {@link ITreeItemAxis}

-	 * @param axisToDestroy

-	 *            the {@link ITreeItemAxis} to destroy

-	 */

-	public static void destroyITreeItemAxis(final TransactionalEditingDomain domain, final ITreeItemAxis axisToDestroy) {

-		try {

-			GMFUnsafe.write(domain, new Runnable() {

-

-				@Override

-				public void run() {

-					axisToDestroy.setParent(null);

-				}

-			});

-		} catch (InterruptedException e) {

-			Activator.log.error(e);

-		} catch (RollbackException e) {

-			Activator.log.error(e);

-		}

-	}

-

-	/**

-	 * Does the linkage between semantic element and IAxis inside a map used by an {@link ITreeItemAxisManagerForEventList}

-	 *

-	 * @param managedElements

-	 *            a map owning elements managed by an {@link ITreeItemAxisManagerForEventListt} : keys are semantic element and values are {@link ITreeItemAxis} representation for the semantic element

-	 * @param axis

-	 *            the axis

-	 */

-	public static final void linkITreeItemAxisToSemanticElement(final Map<Object, Set<ITreeItemAxis>> managedElements, final ITreeItemAxis axis) {

-		final Object object = axis.getElement();

-		Set<ITreeItemAxis> value = managedElements.get(object);

-		if (value == null) {

-			value = new HashSet<ITreeItemAxis>();

-			managedElements.put(object, value);

-		}

-		value.add(axis);

-	}

-

-	/**

-	 * Undoes the linkage between semantic element and IAxis inside a map used by an {@link ITreeItemAxisManagerForEventList}

-	 *

-	 * @param managedElements

-	 *            a map owning elements managed by an {@link ITreeItemAxisManagerForEventListt} : keys are semantic element and values are {@link ITreeItemAxis} representation for the semantic element

-	 * @param axis

-	 *            the axis

-	 */

-	public static final void unlinkITreeItemAxisToSemanticElement(final Map<Object, Set<ITreeItemAxis>> managedElements, final ITreeItemAxis axis) {

-		final Object element = axis.getElement();

-		Set<ITreeItemAxis> values = managedElements.get(element);

-		if (values != null) {

-			values.remove(axis);

-		}

-		if (values == null || values.size() == 0) {

-			managedElements.remove(element);

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * 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:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.tree;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
+import org.eclipse.papyrus.infra.nattable.Activator;
+import org.eclipse.papyrus.infra.nattable.manager.axis.ITreeItemAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+
+/**
+ * @author VL222926
+ *
+ */
+// TODO : refactore me to use IAxisFactory ?
+public class ITreeItemAxisHelper {
+
+	private ITreeItemAxisHelper() {
+		// to prevent instanciation
+	}
+
+	/**
+	 *
+	 * @param editingDomain
+	 *            the editing domain to use to create the ITreeItemAxis
+	 * @param parentAxis
+	 *            the parent axis to use for the created ITreeItemAxis
+	 * @param child
+	 *            the object to wrap in the created ITreeItemAxis
+	 * @param axisRepresentation
+	 *            the axis representation of the axis manager providing its ITreeItemAxis
+	 * @return
+	 *         the created {@link ITreeItemAxis}
+	 */
+	public static ITreeItemAxis createITreeItemAxis(final TransactionalEditingDomain editingDomain, final ITreeItemAxis parentAxis, final Object child, final AxisManagerRepresentation axisRepresentation) {
+		final ITreeItemAxis axis;
+		if (child instanceof EObject) {
+			axis = NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis();
+			((EObjectTreeItemAxis) axis).setElement((EObject) child);
+		} else {
+			axis = null;
+			throw new UnsupportedOperationException("The only managed case is EObject, others cases are not yet managed"); //$NON-NLS-1$
+		}
+
+		try {
+			if(null != editingDomain){
+				GMFUnsafe.write(editingDomain, new Runnable() {
+	
+					@Override
+					public void run() {
+						if (parentAxis != null) {
+							axis.setParent(parentAxis);
+						}
+						axis.setManager(axisRepresentation);
+					}
+				});
+			}else{
+				if (parentAxis != null) {
+					axis.setParent(parentAxis);
+				}
+				axis.setManager(axisRepresentation);
+			}
+		} catch (InterruptedException e) {
+			Activator.log.error(e);
+		} catch (RollbackException e) {
+			Activator.log.error(e);
+		}
+		return axis;
+	}
+
+	/**
+	 * This method to destroy an {@link ITreeItemAxis} from the model
+	 *
+	 * @param domain
+	 *            the editing domain to use to drestoy the {@link ITreeItemAxis}
+	 * @param axisToDestroy
+	 *            the {@link ITreeItemAxis} to destroy
+	 */
+	public static void destroyITreeItemAxis(final TransactionalEditingDomain domain, final ITreeItemAxis axisToDestroy) {
+		try {
+			GMFUnsafe.write(domain, new Runnable() {
+
+				@Override
+				public void run() {
+					axisToDestroy.setParent(null);
+				}
+			});
+		} catch (InterruptedException e) {
+			Activator.log.error(e);
+		} catch (RollbackException e) {
+			Activator.log.error(e);
+		}
+	}
+
+	/**
+	 * Does the linkage between semantic element and IAxis inside a map used by an {@link ITreeItemAxisManagerForEventList}
+	 *
+	 * @param managedElements
+	 *            a map owning elements managed by an {@link ITreeItemAxisManagerForEventListt} : keys are semantic element and values are {@link ITreeItemAxis} representation for the semantic element
+	 * @param axis
+	 *            the axis
+	 */
+	public static final void linkITreeItemAxisToSemanticElement(final Map<Object, Set<ITreeItemAxis>> managedElements, final ITreeItemAxis axis) {
+		final Object object = axis.getElement();
+		Set<ITreeItemAxis> value = managedElements.get(object);
+		if (value == null) {
+			value = new HashSet<ITreeItemAxis>();
+			managedElements.put(object, value);
+		}
+		value.add(axis);
+	}
+
+	/**
+	 * Undoes the linkage between semantic element and IAxis inside a map used by an {@link ITreeItemAxisManagerForEventList}
+	 *
+	 * @param managedElements
+	 *            a map owning elements managed by an {@link ITreeItemAxisManagerForEventListt} : keys are semantic element and values are {@link ITreeItemAxis} representation for the semantic element
+	 * @param axis
+	 *            the axis
+	 */
+	public static final void unlinkITreeItemAxisToSemanticElement(final Map<Object, Set<ITreeItemAxis>> managedElements, final ITreeItemAxis axis) {
+		final Object element = axis.getElement();
+		Set<ITreeItemAxis> values = managedElements.get(element);
+		if (values != null) {
+			values.remove(axis);
+		}
+		if (values == null || values.size() == 0) {
+			managedElements.remove(element);
+		}
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java
index b753a2f4345..fdf31a746b6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java
@@ -1,102 +1,110 @@
-/*****************************************************************************

- * 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.utils;

-

-

-/**

- * 

- * The constants used in the Papyrus NatTable Framework

- *

- */

-public class Constants {

-

-	private Constants() {

-		// to prevent instanciation

-	}

-

-	public static final String BEGIN_OF_COLLECTION = "["; //$NON-NLS-1$

-

-	public static final String END_OF_COLLECTION = "]"; //$NON-NLS-1$

-

-	/**

-	 * The String used to represent big collections

-	 * Example: [v1, v2, v3, ...]

-	 */

-	public static final String BIG_COLLECTION = "..."; //$NON-NLS-1$

-

-	public static final String SEPARATOR = ", "; //$NON-NLS-1$

-

-	public static final String NOT_AVALAIBLE = "N/A"; //$NON-NLS-1$

-

-	public static final String INFINITY_STAR = "*"; //$NON-NLS-1$

-

-	public static final String INFINITE_MINUS_ONE = "-1"; //$NON-NLS-1$

-

-	/**

-	 * the context to use to find the label provider used to display values in cells and headers

-	 */

-	public static final String TABLE_LABEL_PROVIDER_CONTEXT = "org.eclipse.papyrus.infra.nattable.full.labelprovider";//$NON-NLS-1$

-

-	/**

-	 * the context to use to find the label provider used to display values in the headers

-	 */

-	public static final String HEADER_LABEL_PROVIDER_CONTEXT = "org.eclipse.papyrus.infra.nattable.header.labelprovider";//$NON-NLS-1$

-

-

-	public static final String HEADER_LABEL_PROVIDER_TREE_FILLING_CONFIGURATION_CONTEXT = "org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider"; //$NON-NLS-1$

-

-	/**

-	 * the context to use to find the label provider used to display values in the body of the table

-	 */

-

-	public static final String BODY_LABEL_PROVIDER_CONTEXT = "org.eclipse.papyrus.infra.nattable.body.labelprovider";//$NON-NLS-1$

-

-	/**

-	 * the id of the command specific for rows in the table

-	 */

-	public static final String ROW_HEADER_COMMANDS_CATEGORY = "org.eclipse.papyrus.infra.nattable.rows.command.category"; //$NON-NLS-1$

-

-

-	/**

-	 * The name of the parameter used for the sort command

-	 */

-	public static final String SORT_COMMAND_PARAMETER = "org.eclipse.papyrus.infra.nattable.sort.command.alphabetic.order.parameter"; //$NON-NLS-1$

-

-	/**

-	 * the key used to store the container of the pasted element in a map

-	 */

-	public static final String PASTED_ELEMENT_CONTAINER_KEY = "pastedElementContainer"; //$NON-NLS-1$

-

-	/**

-	 * the key used to store the references to set after to have attached the pasted element to the model

-	 */

-	public static final String REFERENCES_TO_SET_KEY = "referencesToSet"; //$NON-NLS-1$

-

-	/**

-	 * the key used to register additional post actions to conclude the paste. the returned value must be a Collection<String>

-	 * These post actions have been executed by CellManager, but they must be concluded.

-	 * These post actions are not defined in the configuration of the table, but added by CellManager

-	 *

-	 * This key is used to be able to apply stereotype required by columns properties, when there are no post actions defined

-	 * in the paste configuration of the table

-	 * see bug 431691: [Table 2] Paste from Spreadsheet must be able to apply required stereotypes for column properties in all usecases

-	 */

-	public static final String ADDITIONAL_POST_ACTIONS_TO_CONCLUDE_PASTE_KEY = "additionnal_post_actions_to_conclude_paste"; //$NON-NLS-1$

-

-	/**

-	 * the key used to store the cells to attached to the model

-	 */

-	public static final String CELLS_TO_ADD_KEY = "cellsToAdd"; //$NON-NLS-1$

-

-}

+/*****************************************************************************
+ * 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.utils;
+
+
+/**
+ * 
+ * The constants used in the Papyrus NatTable Framework
+ *
+ */
+public class Constants {
+
+	private Constants() {
+		// to prevent instanciation
+	}
+
+	public static final String BEGIN_OF_COLLECTION = "["; //$NON-NLS-1$
+
+	public static final String END_OF_COLLECTION = "]"; //$NON-NLS-1$
+
+	/**
+	 * The String used to represent big collections
+	 * Example: [v1, v2, v3, ...]
+	 */
+	public static final String BIG_COLLECTION = "..."; //$NON-NLS-1$
+
+	public static final String SEPARATOR = ", "; //$NON-NLS-1$
+
+	public static final String NOT_AVALAIBLE = "N/A"; //$NON-NLS-1$
+
+	public static final String INFINITY_STAR = "*"; //$NON-NLS-1$
+
+	public static final String INFINITE_MINUS_ONE = "-1"; //$NON-NLS-1$
+
+	/**
+	 * the context to use to find the label provider used to display values in cells and headers
+	 */
+	public static final String TABLE_LABEL_PROVIDER_CONTEXT = "org.eclipse.papyrus.infra.nattable.full.labelprovider";//$NON-NLS-1$
+
+	/**
+	 * the context to use to find the label provider used to display values in the headers
+	 */
+	public static final String HEADER_LABEL_PROVIDER_CONTEXT = "org.eclipse.papyrus.infra.nattable.header.labelprovider";//$NON-NLS-1$
+
+	/**
+	 * The tree filling feature configuration context.
+	 */
+	public static final String HEADER_LABEL_PROVIDER_TREE_FILLING_FEATURE_CONFIGURATION_CONTEXT = "org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider"; //$NON-NLS-1$
+	
+	/**
+	 * The tree filling operation configuration context.
+	 */
+	public static final String HEADER_LABEL_PROVIDER_TREE_FILLING_OPERATION_CONFIGURATION_CONTEXT=	"org.eclipse.papyrus.infra.nattable.header.treefilling.operation.labelprovider"; //$NON-NLS-1$
+
+	
+	/**
+	 * the context to use to find the label provider used to display values in the body of the table
+	 */
+
+	public static final String BODY_LABEL_PROVIDER_CONTEXT = "org.eclipse.papyrus.infra.nattable.body.labelprovider";//$NON-NLS-1$
+
+	/**
+	 * the id of the command specific for rows in the table
+	 */
+	public static final String ROW_HEADER_COMMANDS_CATEGORY = "org.eclipse.papyrus.infra.nattable.rows.command.category"; //$NON-NLS-1$
+
+
+	/**
+	 * The name of the parameter used for the sort command
+	 */
+	public static final String SORT_COMMAND_PARAMETER = "org.eclipse.papyrus.infra.nattable.sort.command.alphabetic.order.parameter"; //$NON-NLS-1$
+
+	/**
+	 * the key used to store the container of the pasted element in a map
+	 */
+	public static final String PASTED_ELEMENT_CONTAINER_KEY = "pastedElementContainer"; //$NON-NLS-1$
+
+	/**
+	 * the key used to store the references to set after to have attached the pasted element to the model
+	 */
+	public static final String REFERENCES_TO_SET_KEY = "referencesToSet"; //$NON-NLS-1$
+
+	/**
+	 * the key used to register additional post actions to conclude the paste. the returned value must be a Collection<String>
+	 * These post actions have been executed by CellManager, but they must be concluded.
+	 * These post actions are not defined in the configuration of the table, but added by CellManager
+	 *
+	 * This key is used to be able to apply stereotype required by columns properties, when there are no post actions defined
+	 * in the paste configuration of the table
+	 * see bug 431691: [Table 2] Paste from Spreadsheet must be able to apply required stereotypes for column properties in all usecases
+	 */
+	public static final String ADDITIONAL_POST_ACTIONS_TO_CONCLUDE_PASTE_KEY = "additionnal_post_actions_to_conclude_paste"; //$NON-NLS-1$
+
+	/**
+	 * the key used to store the cells to attached to the model
+	 */
+	public static final String CELLS_TO_ADD_KEY = "cellsToAdd"; //$NON-NLS-1$
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
index 8a28f6d41ac..18f3a8b0b71 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
@@ -1,520 +1,527 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST and others.

- * 

- * 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:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.nattable.wizard;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.jface.viewers.ViewerComparator;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.factory.IAxisFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.nattable.utils.StringComparator;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

-import org.eclipse.papyrus.infra.nattable.wizard.pages.ConfigurePasteForCategoriesWizardPage;

-import org.eclipse.papyrus.infra.nattable.wizard.pages.SelectCategoriesWizardPage;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.papyrus.infra.tools.util.TypeUtils;

-import org.eclipse.papyrus.infra.widgets.providers.FlattenableRestrictedFilteredContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * @author VL222926

- *         This wizard allows to configure the categories to listen in the table And the paste action for each categories

- */

-public class ConfigureTableCategoriesWizard extends AbstractTableWizard {

-

-	/**

-	 * the page used to choose the categories

-	 */

-	private SelectCategoriesWizardPage categoriesPage;

-

-	/**

-	 * the page used to configure the paste

-	 */

-	private ConfigurePasteForCategoriesWizardPage pastePage;

-

-	/**

-	 * the nattable model manager

-	 */

-	private INattableModelManager manager;

-

-	/**

-	 * the nattable widget

-	 */

-	private final NatTable natTable;

-

-	/**

-	 * the initial selection

-	 */

-	private List<Object> initialSelection;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	public ConfigureTableCategoriesWizard(INattableModelManager manager) {

-		this.manager = manager;

-		this.natTable = (NatTable) ((IAdaptable) manager).getAdapter(NatTable.class);

-		setWindowTitle("Configure Categories");

-		this.initialSelection = createInitialSelection();

-	}

-

-	/**

-	 * 

-	 * @param selector

-	 *            the reference selector

-	 * @return

-	 *         the content provider to use for the selector

-	 */

-	protected IStaticContentProvider createSelectorContentProvider(ReferenceSelector selector) {

-		final IAxisManager editedAxisManager = this.manager.getColumnAxisManager();

-		IStaticContentProvider provider = editedAxisManager.createPossibleAxisContentProvider(true);

-		Assert.isNotNull(provider);

-

-		return new FlattenableRestrictedFilteredContentProvider((IRestrictedContentProvider) provider, selector) {

-

-			/**

-			 * @see org.eclipse.papyrus.infra.widgets.providers.FlattenableRestrictedFilteredContentProvider#isValidValue(java.lang.Object)

-			 *

-			 * @param element

-			 * @return

-			 */

-			@Override

-			public boolean isValidValue(Object element) {

-				// EMF dependency, must not be done here, it should be better with a new content provider service

-				return element instanceof EReference && ((EReference) element).isMany() && element != EcorePackage.eINSTANCE.getEModelElement_EAnnotations();

-			}

-		};

-

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the created and initialized reference selector

-	 */

-	protected ReferenceSelector createReferenceSelector() {

-		ReferenceSelector selector = new ReferenceSelector(false) {

-

-

-			/**

-			 * 

-			 * @see org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector#createControls(org.eclipse.swt.widgets.Composite)

-			 *

-			 * @param parent

-			 */

-			@Override

-			public void createControls(Composite parent) {

-				super.createControls(parent);

-				this.treeViewer.setComparator(new ViewerComparator(new StringComparator()));// should always be string element

-			}

-		};

-

-		final LabelProviderService serv = this.natTable.getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProvider labelProvider = serv.getLabelProvider();

-		selector.setLabelProvider(labelProvider);

-		selector.setContentProvider(createSelectorContentProvider(selector));

-		return selector;

-

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the page to use to select the categories to listen in the table

-	 */

-	protected SelectCategoriesWizardPage createSelectCategoriesPage() {

-		this.categoriesPage = new SelectCategoriesWizardPage(createReferenceSelector());

-		final LabelProviderService serv = this.natTable.getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		this.categoriesPage.setLabelProvider(new ITreeItemWrappedObjectLabelProvider(serv.getLabelProvider(), this.natTable));

-		this.categoriesPage.setInitialElementSelections(this.initialSelection);

-		return this.categoriesPage;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the paste page used to configure the paste

-	 */

-	protected ConfigurePasteForCategoriesWizardPage createConfigurePastePage() {

-		this.pastePage = new ConfigurePasteForCategoriesWizardPage(createReferenceSelector());

-		final LabelProviderService serv = this.natTable.getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		this.pastePage.setLabelProvider(new ITreeItemWrappedObjectLabelProvider(serv.getLabelProvider(), this.natTable));

-		this.pastePage.setInitialElementSelections(this.initialSelection);

-		return this.pastePage;

-	}

-

-	/**

-	 * @see org.eclipse.jface.wizard.Wizard#addPages()

-	 *

-	 */

-	@Override

-	public void addPages() {

-		super.addPages();

-		addPage(createSelectCategoriesPage());

-		// addPage(createConfigurePastePage());

-	}

-

-	/**

-	 * 

-	 * The label provider to use for the selected elements viewer

-	 *

-	 */

-	private static class ITreeItemWrappedObjectLabelProvider implements ILabelProvider {

-

-		/**

-		 * default label provider

-		 */

-		private ILabelProvider wrappedLabelprovider;

-

-		private NatTable natTable;

-

-		/**

-		 * 

-		 * Constructor.

-		 *

-		 * @param wrappedProvider

-		 */

-		public ITreeItemWrappedObjectLabelProvider(ILabelProvider wrappedProvider, NatTable natTable) {

-			this.wrappedLabelprovider = wrappedProvider;

-			this.natTable = natTable;

-		}

-

-		/**

-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

-		 *

-		 * @param arg0

-		 */

-		@Override

-		public void addListener(ILabelProviderListener arg0) {

-			// nothing to do

-		}

-

-		/**

-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

-		 *

-		 */

-		@Override

-		public void dispose() {

-			// nothing to do

-		}

-

-		/**

-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

-		 *

-		 * @param arg0

-		 * @param arg1

-		 * @return

-		 */

-		@Override

-		public boolean isLabelProperty(Object arg0, String arg1) {

-			return false;

-		}

-

-		/**

-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

-		 *

-		 * @param arg0

-		 */

-		@Override

-		public void removeListener(ILabelProviderListener arg0) {

-			// nothing to do

-		}

-

-		/**

-		 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)

-		 *

-		 * @param arg0

-		 * @return

-		 */

-		@Override

-		public Image getImage(Object arg0) {

-			if (arg0 instanceof ITreeItemAxis) {

-				arg0 = ((ITreeItemAxis) arg0).getElement();

-			}

-			return wrappedLabelprovider.getImage(arg0);

-		}

-

-		/**

-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

-		 *

-		 * @param arg0

-		 * @return

-		 */

-		@Override

-		public String getText(Object arg0) {

-			Assert.isTrue(arg0 instanceof ITreeItemAxis);

-			ITreeItemAxis axis = (ITreeItemAxis) arg0;

-			Object element = axis.getElement();

-			if (element instanceof String) {

-				if (TypeUtils.isIntegerValue((String) element)) {

-					Integer value = Integer.parseInt((String) element);

-					int depth = value;

-					if (depth == 0 && axis.getChildren().isEmpty()) {

-						return NLS.bind("depth {0} (filled by user)", depth);

-					} else {

-						return NLS.bind("depth {0}", depth);

-					}

-				}

-			}

-			LabelProviderContextElementWrapper wrapper = new LabelProviderContextElementWrapper(axis, natTable.getConfigRegistry());

-			final LabelProviderService serv = this.natTable.getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-			ILabelProvider p = serv.getLabelProvider(wrapper);

-			p = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-			return p.getText(wrapper);

-			// return wrappedLabelprovider.getText(wrapper);

-		}

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the initial selection to use in the wizard page

-	 */

-	protected List<Object> createInitialSelection() {

-		Table table = this.manager.getTable();

-		EObject tableContext = table.getContext();

-

-		// the number of elements in initial selection is the number of AxisManagerRepresentation for rows

-		List<Object> initialSelection = new ArrayList<Object>();

-

-		// 0. we iterate on the row axis manager representation

-		for (AxisManagerRepresentation rep : getRowAxisManagerRepresentations(table)) {// this iteration has not been tested

-			Map<Object, ITreeItemAxis> map = new HashMap<Object, ITreeItemAxis>();

-			ITreeItemAxis rootAxis = IAxisFactory.createITreeItemAxis(null, tableContext, rep, null);

-			map.put(tableContext, rootAxis);

-			initialSelection.add(rootAxis);

-

-			// 1. we cross the existing tree filling configuration

-			for (TreeFillingConfiguration fillingConf : FillingConfigurationUtils.getTreeFillingConfiguration(table, rep)) {

-				Integer depth = Integer.valueOf(fillingConf.getDepth());

-				ITreeItemAxis axis = map.get(depth);

-				// 2. we create an idAxis if required for the depth of the current filling configuration

-				if (axis == null) {

-					axis = IAxisFactory.createITreeItemAxis(rootAxis, depth, null, null);

-					map.put(depth, axis);

-				}

-

-				// 3. we create an axis to represent the element represented by the TreeFillingConfiguration

-				Object representedElement = fillingConf.getAxisUsedAsAxisProvider().getElement();

-				for (ITreeItemAxis curr : axis.getChildren()) {

-					if (curr.getElement() == representedElement) {

-						continue;

-					}

-				}

-				ITreeItemAxis categoryAxis = IAxisFactory.createITreeItemAxis(axis, representedElement, null, fillingConf.getAxisUsedAsAxisProvider().getAlias());

-				if (fillingConf.getPasteConfiguration() != null) {

-					// create an axis to configure the paste in the table

-					IAxisFactory.createITreeItemAxis(categoryAxis, fillingConf.getPasteConfiguration(), null, null);

-				}

-			}

-			// the 0 depth must always be here

-			if (map.get(Integer.valueOf(0)) == null) {

-				ITreeItemAxis axis = IAxisFactory.createITreeItemAxis(rootAxis, 0, null, null);

-				map.put(Integer.valueOf(0), axis);

-				rootAxis.getChildren().move(0, axis);

-			}

-		}

-

-		return initialSelection;

-	}

-

-

-	/**

-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()

-	 *

-	 * @return

-	 */

-	@Override

-	public boolean performFinish() {

-		Table table = manager.getTable();

-		List<ITreeItemAxis> configureCategoriesResult = new ArrayList<ITreeItemAxis>();

-		for (Object curr : initialSelection) {

-			configureCategoriesResult.add((ITreeItemAxis) curr);

-		}

-		Command cmd = getConfigureCategoriesCommand(configureCategoriesResult);

-		EditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);

-		domain.getCommandStack().execute(cmd);

-		return true;

-	}

-

-	private ILabelProviderConfiguration getLabelConfigurationForTreeFillingConfiguration(Table table) {

-		TableHeaderAxisConfiguration conf = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-		for (IAxisConfiguration tmp : conf.getOwnedAxisConfigurations()) {

-			if (tmp instanceof TreeFillingConfiguration) {

-				if (((TreeFillingConfiguration) tmp).getLabelProvider() != null) {

-					return ((TreeFillingConfiguration) tmp).getLabelProvider();

-				}

-			}

-		}

-		return null;

-	}

-

-	private String getLabelProviderContextForTreeFillingConfiguration(Table table) {

-		return Constants.HEADER_LABEL_PROVIDER_TREE_FILLING_CONFIGURATION_CONTEXT;

-	}

-

-

-	protected Command getConfigureCategoriesCommand(final List<ITreeItemAxis> userSelection) {

-		return new RecordingCommand(TableEditingDomainUtils.getTableEditingDomain(manager.getTable())) {

-

-			@Override

-			protected void doExecute() {

-				Table table = manager.getTable();

-

-				for (Object tmp : userSelection) {

-					ITreeItemAxis root = (ITreeItemAxis) tmp;

-					AxisManagerRepresentation representation = root.getManager();

-					List<TreeFillingConfiguration> createdFillingConfiguration = new ArrayList<TreeFillingConfiguration>();

-					for (ITreeItemAxis depthItem : root.getChildren()) {

-						Assert.isTrue(CategoriesWizardUtils.isDepthItem(depthItem));

-						int wantedDepth = Integer.valueOf((String) depthItem.getElement());

-						if (depthItem.getChildren().isEmpty()) {

-							// we do nothing if there is no child, in standard usecase, it is only possible when wantedDepth==0;

-							continue;

-						}

-

-

-						for (ITreeItemAxis categoryItem : depthItem.getChildren()) {

-

-							// 1. try to find existing conf

-							TreeFillingConfiguration newConf = findExistingTreeFillingConfiguration(table, representation, wantedDepth, categoryItem.getElement());

-							if (newConf == null || EMFHelper.isReadOnly(newConf)) {

-								// we create new TreeFillingConfiguration

-								newConf = NattableaxisconfigurationFactory.eINSTANCE.createTreeFillingConfiguration();

-								newConf.setDepth(wantedDepth);

-								IAxis axis = IAxisFactory.createAxisForFeature(categoryItem.getElement(), representation, categoryItem.getAlias());

-								newConf.setAxisUsedAsAxisProvider(axis);

-								newConf.setLabelProvider(getLabelConfigurationForTreeFillingConfiguration(table));

-								newConf.setLabelProviderContext(getLabelProviderContextForTreeFillingConfiguration(table));

-							} else {

-

-								// update the alias if required

-								String oldAlias = newConf.getAxisUsedAsAxisProvider().getAlias();

-								String newAlias = categoryItem.getAlias();

-								if ((oldAlias != null && !oldAlias.equals(newAlias)) || (newAlias != null && !newAlias.equals(oldAlias))) {

-									newConf.getAxisUsedAsAxisProvider().setAlias(newAlias);

-								}

-							}

-

-

-							createdFillingConfiguration.add(newConf);

-

-							// TODO : manage paste

-						}

-					}

-

-					LocalTableHeaderAxisConfiguration local = (LocalTableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(table);

-					if (local == null) {

-						local = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table));

-						table.setLocalRowHeaderAxisConfiguration(local);

-					}

-					List<AxisManagerConfiguration> axisManagerConfigurations = local.getAxisManagerConfigurations();

-					AxisManagerConfiguration wantedAxisManagerConfiguration = null;

-					for (AxisManagerConfiguration curr : axisManagerConfigurations) {

-						if (curr.getAxisManager() == representation) {

-							wantedAxisManagerConfiguration = curr;

-						}

-					}

-					if (wantedAxisManagerConfiguration == null) {

-						wantedAxisManagerConfiguration = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();

-						wantedAxisManagerConfiguration.setAxisManager(representation);

-						// TODO

-						// /wantedAxisManagerConfiguration.setLocalHeaderLabelConfiguration(value);

-						local.getAxisManagerConfigurations().add(wantedAxisManagerConfiguration);

-					}

-					local.getOwnedAxisConfigurations().clear();

-					local.getOwnedAxisConfigurations().addAll(createdFillingConfiguration);

-					wantedAxisManagerConfiguration.getLocalSpecificConfigurations().clear();

-					wantedAxisManagerConfiguration.getLocalSpecificConfigurations().addAll(createdFillingConfiguration);

-				}

-			}

-		};

-	}

-

-	/**

-	 * 

-	 * @param table

-	 * @param representedAxisManager

-	 * @param depth

-	 * @param representedObject

-	 * @return

-	 */

-	// TODO : move me

-	public static final TreeFillingConfiguration findExistingTreeFillingConfiguration(Table table, AxisManagerRepresentation representedAxisManager, int depth, Object representedObject) {

-		List<TreeFillingConfiguration> existingConf = FillingConfigurationUtils.getTreeFillingConfigurationForDepth(table, representedAxisManager, depth);

-		for (TreeFillingConfiguration treeFillingConfiguration : existingConf) {

-			if (treeFillingConfiguration.getAxisUsedAsAxisProvider().getElement().equals(representedObject)) {

-				return treeFillingConfiguration;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *            the table

-	 * @return

-	 *         the axis manager representation for rows

-	 */

-	private static final List<AxisManagerRepresentation> getRowAxisManagerRepresentations(Table table) {

-		AbstractHeaderAxisConfiguration tmp = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-		Assert.isTrue(tmp instanceof TableHeaderAxisConfiguration);

-		TableHeaderAxisConfiguration conf = (TableHeaderAxisConfiguration) tmp;

-		return conf.getAxisManagers();

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ * 
+ * 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:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.nattable.wizard;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.factory.IAxisFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.Constants;
+import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.nattable.utils.StringComparator;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
+import org.eclipse.papyrus.infra.nattable.wizard.pages.ConfigurePasteForCategoriesWizardPage;
+import org.eclipse.papyrus.infra.nattable.wizard.pages.SelectCategoriesWizardPage;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.infra.tools.util.TypeUtils;
+import org.eclipse.papyrus.infra.widgets.providers.FlattenableRestrictedFilteredContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;
+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
+import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * @author VL222926
+ *         This wizard allows to configure the categories to listen in the table And the paste action for each categories
+ */
+public class ConfigureTableCategoriesWizard extends AbstractTableWizard {
+
+	/**
+	 * the page used to choose the categories
+	 */
+	private SelectCategoriesWizardPage categoriesPage;
+
+	/**
+	 * the page used to configure the paste
+	 */
+	private ConfigurePasteForCategoriesWizardPage pastePage;
+
+	/**
+	 * the nattable model manager
+	 */
+	private INattableModelManager manager;
+
+	/**
+	 * the nattable widget
+	 */
+	private final NatTable natTable;
+
+	/**
+	 * the initial selection
+	 */
+	private List<Object> initialSelection;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 */
+	public ConfigureTableCategoriesWizard(INattableModelManager manager) {
+		this.manager = manager;
+		this.natTable = (NatTable) ((IAdaptable) manager).getAdapter(NatTable.class);
+		setWindowTitle("Configure Categories");
+		this.initialSelection = createInitialSelection();
+	}
+
+	/**
+	 * 
+	 * @param selector
+	 *            the reference selector
+	 * @return
+	 * 		the content provider to use for the selector
+	 */
+	protected IStaticContentProvider createSelectorContentProvider(ReferenceSelector selector) {
+		final IAxisManager editedAxisManager = this.manager.getColumnAxisManager();
+		IStaticContentProvider provider = editedAxisManager.createPossibleAxisContentProvider(true);
+		Assert.isNotNull(provider);
+
+		return new FlattenableRestrictedFilteredContentProvider((IRestrictedContentProvider) provider, selector) {
+
+			/**
+			 * @see org.eclipse.papyrus.infra.widgets.providers.FlattenableRestrictedFilteredContentProvider#isValidValue(java.lang.Object)
+			 *
+			 * @param element
+			 * @return
+			 */
+			@Override
+			public boolean isValidValue(Object element) {
+				// EMF dependency, must not be done here, it should be better with a new content provider service
+				return element instanceof EReference && ((EReference) element).isMany() && element != EcorePackage.eINSTANCE.getEModelElement_EAnnotations();
+			}
+		};
+
+	}
+
+	/**
+	 * 
+	 * @return
+	 * 		the created and initialized reference selector
+	 */
+	protected ReferenceSelector createReferenceSelector() {
+		ReferenceSelector selector = new ReferenceSelector(false) {
+
+
+			/**
+			 * 
+			 * @see org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector#createControls(org.eclipse.swt.widgets.Composite)
+			 *
+			 * @param parent
+			 */
+			@Override
+			public void createControls(Composite parent) {
+				super.createControls(parent);
+				this.treeViewer.setComparator(new ViewerComparator(new StringComparator()));// should always be string element
+			}
+		};
+
+		final LabelProviderService serv = this.natTable.getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		final ILabelProvider labelProvider = serv.getLabelProvider();
+		selector.setLabelProvider(labelProvider);
+		selector.setContentProvider(createSelectorContentProvider(selector));
+		return selector;
+
+	}
+
+	/**
+	 * 
+	 * @return
+	 * 		the page to use to select the categories to listen in the table
+	 */
+	protected SelectCategoriesWizardPage createSelectCategoriesPage() {
+		this.categoriesPage = new SelectCategoriesWizardPage(createReferenceSelector());
+		final LabelProviderService serv = this.natTable.getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		this.categoriesPage.setLabelProvider(new ITreeItemWrappedObjectLabelProvider(serv.getLabelProvider(), this.natTable));
+		this.categoriesPage.setInitialElementSelections(this.initialSelection);
+		return this.categoriesPage;
+	}
+
+	/**
+	 * 
+	 * @return
+	 * 		the paste page used to configure the paste
+	 */
+	protected ConfigurePasteForCategoriesWizardPage createConfigurePastePage() {
+		this.pastePage = new ConfigurePasteForCategoriesWizardPage(createReferenceSelector());
+		final LabelProviderService serv = this.natTable.getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+		this.pastePage.setLabelProvider(new ITreeItemWrappedObjectLabelProvider(serv.getLabelProvider(), this.natTable));
+		this.pastePage.setInitialElementSelections(this.initialSelection);
+		return this.pastePage;
+	}
+
+	/**
+	 * @see org.eclipse.jface.wizard.Wizard#addPages()
+	 *
+	 */
+	@Override
+	public void addPages() {
+		super.addPages();
+		addPage(createSelectCategoriesPage());
+		// addPage(createConfigurePastePage());
+	}
+
+	/**
+	 * 
+	 * The label provider to use for the selected elements viewer
+	 *
+	 */
+	private static class ITreeItemWrappedObjectLabelProvider implements ILabelProvider {
+
+		/**
+		 * default label provider
+		 */
+		private ILabelProvider wrappedLabelprovider;
+
+		private NatTable natTable;
+
+		/**
+		 * 
+		 * Constructor.
+		 *
+		 * @param wrappedProvider
+		 */
+		public ITreeItemWrappedObjectLabelProvider(ILabelProvider wrappedProvider, NatTable natTable) {
+			this.wrappedLabelprovider = wrappedProvider;
+			this.natTable = natTable;
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
+		 *
+		 * @param arg0
+		 */
+		@Override
+		public void addListener(ILabelProviderListener arg0) {
+			// nothing to do
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+		 *
+		 */
+		@Override
+		public void dispose() {
+			// nothing to do
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
+		 *
+		 * @param arg0
+		 * @param arg1
+		 * @return
+		 */
+		@Override
+		public boolean isLabelProperty(Object arg0, String arg1) {
+			return false;
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
+		 *
+		 * @param arg0
+		 */
+		@Override
+		public void removeListener(ILabelProviderListener arg0) {
+			// nothing to do
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+		 *
+		 * @param arg0
+		 * @return
+		 */
+		@Override
+		public Image getImage(Object arg0) {
+			if (arg0 instanceof ITreeItemAxis) {
+				arg0 = ((ITreeItemAxis) arg0).getElement();
+			}
+			return wrappedLabelprovider.getImage(arg0);
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+		 *
+		 * @param arg0
+		 * @return
+		 */
+		@Override
+		public String getText(Object arg0) {
+			Assert.isTrue(arg0 instanceof ITreeItemAxis);
+			ITreeItemAxis axis = (ITreeItemAxis) arg0;
+			Object element = axis.getElement();
+			if (element instanceof String) {
+				if (TypeUtils.isIntegerValue((String) element)) {
+					Integer value = Integer.parseInt((String) element);
+					int depth = value;
+					if (depth == 0 && axis.getChildren().isEmpty()) {
+						return NLS.bind("depth {0} (filled by user)", depth);
+					} else {
+						return NLS.bind("depth {0}", depth);
+					}
+				}
+			}
+			LabelProviderContextElementWrapper wrapper = new LabelProviderContextElementWrapper(axis, natTable.getConfigRegistry());
+			final LabelProviderService serv = this.natTable.getConfigRegistry().getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
+			ILabelProvider p = serv.getLabelProvider(wrapper);
+			p = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);
+			return p.getText(wrapper);
+		}
+	}
+
+	/**
+	 * 
+	 * @return
+	 * 		the initial selection to use in the wizard page
+	 */
+	protected List<Object> createInitialSelection() {
+		Table table = this.manager.getTable();
+		EObject tableContext = table.getContext();
+
+		// the number of elements in initial selection is the number of AxisManagerRepresentation for rows
+		List<Object> initialSelection = new ArrayList<Object>();
+
+		// 0. we iterate on the row axis manager representation
+		for (AxisManagerRepresentation rep : getRowAxisManagerRepresentations(table)) {// this iteration has not been tested
+			Map<Object, ITreeItemAxis> map = new HashMap<Object, ITreeItemAxis>();
+			ITreeItemAxis rootAxis = IAxisFactory.createITreeItemAxis(null, tableContext, rep, null);
+			map.put(tableContext, rootAxis);
+			initialSelection.add(rootAxis);
+
+			// 1. we cross the existing tree filling configuration
+			for (TreeFillingConfiguration fillingConf : FillingConfigurationUtils.getTreeFillingConfiguration(table, rep)) {
+				Integer depth = Integer.valueOf(fillingConf.getDepth());
+				ITreeItemAxis axis = map.get(depth);
+				// 2. we create an idAxis if required for the depth of the current filling configuration
+				if (axis == null) {
+					axis = IAxisFactory.createITreeItemAxis(rootAxis, depth, null, null);
+					map.put(depth, axis);
+				}
+
+				// 3. we create an axis to represent the element represented by the TreeFillingConfiguration
+				Object representedElement = fillingConf.getAxisUsedAsAxisProvider().getElement();
+				for (ITreeItemAxis curr : axis.getChildren()) {
+					if (curr.getElement() == representedElement) {
+						continue;
+					}
+				}
+				ITreeItemAxis categoryAxis = IAxisFactory.createITreeItemAxis(axis, representedElement, null, fillingConf.getAxisUsedAsAxisProvider().getAlias());
+				if (fillingConf.getPasteConfiguration() != null) {
+					// create an axis to configure the paste in the table
+					IAxisFactory.createITreeItemAxis(categoryAxis, fillingConf.getPasteConfiguration(), null, null);
+				}
+			}
+			// the 0 depth must always be here
+			if (map.get(Integer.valueOf(0)) == null) {
+				ITreeItemAxis axis = IAxisFactory.createITreeItemAxis(rootAxis, 0, null, null);
+				map.put(Integer.valueOf(0), axis);
+				rootAxis.getChildren().move(0, axis);
+			}
+		}
+
+		return initialSelection;
+	}
+
+
+	/**
+	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
+	 *
+	 * @return
+	 */
+	@Override
+	public boolean performFinish() {
+		Table table = manager.getTable();
+		List<ITreeItemAxis> configureCategoriesResult = new ArrayList<ITreeItemAxis>();
+		for (Object curr : initialSelection) {
+			configureCategoriesResult.add((ITreeItemAxis) curr);
+		}
+		Command cmd = getConfigureCategoriesCommand(configureCategoriesResult);
+		EditingDomain domain = TableEditingDomainUtils.getTableEditingDomain(table);
+		domain.getCommandStack().execute(cmd);
+		return true;
+	}
+
+	private ILabelProviderConfiguration getLabelConfigurationForTreeFillingConfiguration(Table table) {
+		TableHeaderAxisConfiguration conf = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
+		for (IAxisConfiguration tmp : conf.getOwnedAxisConfigurations()) {
+			if (tmp instanceof TreeFillingConfiguration) {
+				if (((TreeFillingConfiguration) tmp).getLabelProvider() != null) {
+					return ((TreeFillingConfiguration) tmp).getLabelProvider();
+				}
+			}
+		}
+		return null;
+	}
+
+	private String getLabelProviderContextForTreeFillingConfiguration(final Table table, final Object listenObject) {
+		String result = ""; //$NON-NLS-1$
+		if (listenObject instanceof EStructuralFeature) {
+			result = Constants.HEADER_LABEL_PROVIDER_TREE_FILLING_FEATURE_CONFIGURATION_CONTEXT;
+		} else if (listenObject instanceof EOperation) {
+			result = Constants.HEADER_LABEL_PROVIDER_TREE_FILLING_OPERATION_CONFIGURATION_CONTEXT;
+		}
+		return result;
+	}
+
+
+	protected Command getConfigureCategoriesCommand(final List<ITreeItemAxis> userSelection) {
+		return new RecordingCommand(TableEditingDomainUtils.getTableEditingDomain(manager.getTable())) {
+
+			@Override
+			protected void doExecute() {
+				Table table = manager.getTable();
+
+				for (Object tmp : userSelection) {
+					ITreeItemAxis root = (ITreeItemAxis) tmp;
+					AxisManagerRepresentation representation = root.getManager();
+					List<TreeFillingConfiguration> createdFillingConfiguration = new ArrayList<TreeFillingConfiguration>();
+					for (ITreeItemAxis depthItem : root.getChildren()) {
+						Assert.isTrue(CategoriesWizardUtils.isDepthItem(depthItem));
+						int wantedDepth = Integer.valueOf((String) depthItem.getElement());
+						if (depthItem.getChildren().isEmpty()) {
+							// we do nothing if there is no child, in standard usecase, it is only possible when wantedDepth==0;
+							continue;
+						}
+
+
+						for (ITreeItemAxis categoryItem : depthItem.getChildren()) {
+
+							// 1. try to find existing conf
+							TreeFillingConfiguration newConf = findExistingTreeFillingConfiguration(table, representation, wantedDepth, categoryItem.getElement());
+							if (newConf == null || EMFHelper.isReadOnly(newConf)) {
+								// we create new TreeFillingConfiguration
+								newConf = NattableaxisconfigurationFactory.eINSTANCE.createTreeFillingConfiguration();
+								newConf.setDepth(wantedDepth);
+								IAxis axis = IAxisFactory.createAxisForFeature(categoryItem.getElement(), representation, categoryItem.getAlias());
+								newConf.setAxisUsedAsAxisProvider(axis);
+								newConf.setLabelProvider(getLabelConfigurationForTreeFillingConfiguration(table));
+								newConf.setLabelProviderContext(getLabelProviderContextForTreeFillingConfiguration(table, categoryItem.getElement()));
+							} else {
+
+								// update the alias if required
+								String oldAlias = newConf.getAxisUsedAsAxisProvider().getAlias();
+								String newAlias = categoryItem.getAlias();
+								if ((oldAlias != null && !oldAlias.equals(newAlias)) || (newAlias != null && !newAlias.equals(oldAlias))) {
+									newConf.getAxisUsedAsAxisProvider().setAlias(newAlias);
+								}
+							}
+
+
+							createdFillingConfiguration.add(newConf);
+
+							// TODO : manage paste
+						}
+					}
+
+					LocalTableHeaderAxisConfiguration local = (LocalTableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(table);
+					if (local == null) {
+						local = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table));
+						table.setLocalRowHeaderAxisConfiguration(local);
+					}
+					List<AxisManagerConfiguration> axisManagerConfigurations = local.getAxisManagerConfigurations();
+					AxisManagerConfiguration wantedAxisManagerConfiguration = null;
+					for (AxisManagerConfiguration curr : axisManagerConfigurations) {
+						if (curr.getAxisManager() == representation) {
+							wantedAxisManagerConfiguration = curr;
+						}
+					}
+					if (wantedAxisManagerConfiguration == null) {
+						wantedAxisManagerConfiguration = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();
+						wantedAxisManagerConfiguration.setAxisManager(representation);
+						// TODO
+						// /wantedAxisManagerConfiguration.setLocalHeaderLabelConfiguration(value);
+						local.getAxisManagerConfigurations().add(wantedAxisManagerConfiguration);
+					}
+					local.getOwnedAxisConfigurations().clear();
+					local.getOwnedAxisConfigurations().addAll(createdFillingConfiguration);
+					wantedAxisManagerConfiguration.getLocalSpecificConfigurations().clear();
+					wantedAxisManagerConfiguration.getLocalSpecificConfigurations().addAll(createdFillingConfiguration);
+				}
+			}
+		};
+	}
+
+	/**
+	 * 
+	 * @param table
+	 * @param representedAxisManager
+	 * @param depth
+	 * @param representedObject
+	 * @return
+	 */
+	// TODO : move me
+	public static final TreeFillingConfiguration findExistingTreeFillingConfiguration(Table table, AxisManagerRepresentation representedAxisManager, int depth, Object representedObject) {
+		List<TreeFillingConfiguration> existingConf = FillingConfigurationUtils.getTreeFillingConfigurationForDepth(table, representedAxisManager, depth);
+		for (TreeFillingConfiguration treeFillingConfiguration : existingConf) {
+			if (treeFillingConfiguration.getAxisUsedAsAxisProvider().getElement().equals(representedObject)) {
+				return treeFillingConfiguration;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * @param table
+	 *            the table
+	 * @return
+	 * 		the axis manager representation for rows
+	 */
+	private static final List<AxisManagerRepresentation> getRowAxisManagerRepresentations(Table table) {
+		AbstractHeaderAxisConfiguration tmp = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
+		Assert.isTrue(tmp instanceof TableHeaderAxisConfiguration);
+		TableHeaderAxisConfiguration conf = (TableHeaderAxisConfiguration) tmp;
+		return conf.getAxisManagers();
+	}
+
+
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayCommandExecution.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayCommandExecution.java
index 1150fd687ee..4ce30756d20 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayCommandExecution.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayCommandExecution.java
@@ -1,228 +1,238 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * 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:

- *   Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation

- *   Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 455311 : Refactor Stereotype Display

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.notation.Edge;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.commands.SetNodeVisibilityCommand;

-import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStyleValueCommand;

-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.command.SetPersistentViewCommand;

-import org.eclipse.papyrus.uml.diagram.common.util.CommandUtil;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * This Class regroups the Commands and their execution for the Stereotype Display

- * 

- * @author Céline JANSSENS

- *

- */

-public final class StereotypeDisplayCommandExecution {

-	/**

-	 * singleton instance

-	 */

-	private static StereotypeDisplayCommandExecution labelHelper;

-	private StereotypeDisplayUtil helper = StereotypeDisplayUtil.getInstance();

-

-	/** Singleton contructor */

-	private StereotypeDisplayCommandExecution() {

-	}

-

-	/**

-	 * Returns the singleton instance of this class

-	 *

-	 * @return the singleton instance.

-	 */

-	public static StereotypeDisplayCommandExecution getInstance() {

-		if (labelHelper == null) {

-			labelHelper = new StereotypeDisplayCommandExecution();

-		}

-		return labelHelper;

-	}

-

-	/**

-	 * Set the visibility of a view

-	 *

-	 * @param view

-	 *            The view on which the visibility has to be set

-	 * @param isVisible

-	 *            True to make the Compartment visible

-	 */

-	public void setVisibility(final TransactionalEditingDomain domain, final View view, final boolean isVisible, final boolean inCommandStack) {

-

-

-		if (!inCommandStack) {

-			class SetVisibilityRunnable implements Runnable {

-

-				private boolean visible;

-

-				/**

-				 * Constructor.

-				 *

-				 */

-				public SetVisibilityRunnable(boolean visible) {

-					this.visible = visible;

-				}

-

-				/**

-				 * @see java.lang.Runnable#run()

-				 *

-				 */

-				@Override

-				public void run() {

-					if (view.isVisible() != visible) {

-						view.setVisible(visible);

-					}

-				}

-

-			}

-			CommandUtil.executeUnsafeCommand(new SetVisibilityRunnable(isVisible), domain);

-		} else {

-			SetNodeVisibilityCommand visibility = new SetNodeVisibilityCommand(domain, view, isVisible);

-			CommandUtil.executeCommandInStack(visibility, domain);

-		}

-	}

-

-

-	/**

-	 * Set the visibility of a view

-	 *

-	 * @param view

-	 *            The view on which the visibility has to be set

-	 * @param isVisible

-	 *            True to make the Compartment visible

-	 */

-	public void setPersistency(final TransactionalEditingDomain domain, final View view, boolean inCommandStack) {

-

-

-		if (!inCommandStack) {

-

-			class SetPersistencyRunnable implements Runnable {

-

-				/**

-				 * @see java.lang.Runnable#run()

-				 *

-				 */

-				@Override

-				public void run() {

-					makeViewPersistant(view);

-				}

-

-			}

-			CommandUtil.executeUnsafeCommand(new SetPersistencyRunnable(), domain);

-		} else {

-			SetPersistentViewCommand persitence = new SetPersistentViewCommand(domain, view);

-			CommandUtil.executeCommandInStack(persitence, domain);

-		}

-

-	}

-

-	/**

-	 * @param eContainer

-	 */

-	public void makeViewPersistant(View view) {

-		if (view != null) {

-			if (view.eContainer() != null && view.eContainer() instanceof View) {

-

-				// Make the Parent Persistent

-				makeViewPersistant((View) view.eContainer());

-				// Move the view from the Transient List to the Persistent Children list

-				if (!(view instanceof Edge)) {

-					((View) view.eContainer()).getPersistedChildren().add(view);

-					((View) view.eContainer()).getTransientChildren().remove(view);

-				}

-

-			}

-		}

-

-	}

-

-	/**

-	 * Set the depth Name of the Stereotype Label.

-	 * It uses the NamedStyle to store the depth into a View.

-	 * 

-	 * @param stereotype

-	 *            The Stereotype of the Label that should be modified.

-	 * @param nodeView

-	 *            The view of the element that needs to be updated (i.e. The Class)

-	 * @param depth

-	 *            The Depth value as a string (Can be "none", "full" or a negative number )

-	 */

-	public void setDepth(final TransactionalEditingDomain domain, final Stereotype stereotype, final View nodeView, final String depth, final boolean inCommandStack) {

-		final View label = helper.getStereotypeLabel(nodeView, stereotype);

-

-		Command command = new CustomStyleValueCommand(label, depth, NotationPackage.eINSTANCE.getStringValueStyle(), NotationPackage.eINSTANCE.getStringValueStyle_StringValue(), StereotypeDisplayConstant.STEREOTYPE_LABEL_DEPTH);

-

-		if (inCommandStack) {

-

-

-			CommandUtil.executeCommandInStack(command, domain);

-		} else {

-			CommandUtil.executeUnsafeCommand(command, domain);

-		}

-

-	}

-

-	/**

-	 * This Method is called when the user ask explicitly to display a View.

-	 * Then the node is first set as Persistence and the command is put in the command Stack

-	 * before to set the Visibility as wanted.

-	 * 

-	 * @param domain

-	 *            The Transactional Domain

-	 * @param view

-	 *            The View to make visible

-	 * @param visible

-	 *            True if the View has to be visible, false if the Node should be hidden

-	 *

-	 */

-	public void setUserVisibility(TransactionalEditingDomain domain, View view, boolean visible) {

-		if (view != null && domain != null) {

-

-			SetPersistentViewCommand persitence = new SetPersistentViewCommand(domain, view);

-			CommandUtil.executeCommandInStack(persitence, domain);

-			SetNodeVisibilityCommand visibility = new SetNodeVisibilityCommand(domain, view, visible);

-			CommandUtil.executeCommandInStack(visibility, domain);

-

-		}

-	}

-

-

-	/**

-	 * This Method is called when the user ask explicitly to display a View.

-	 * Then the node is first set as Persistence and the command is put in the command Stack

-	 * before to set the Visibility as wanted.

-	 * 

-	 * @param domain

-	 *            The Transactional Domain

-	 * @param view

-	 *            The View to make visible

-	 * @param visible

-	 *            True if the View has to be visible, false if the Node should be hidden

-	 *

-	 */

-	public void setUserDepth(TransactionalEditingDomain domain, Stereotype stereotype, View view, String depth) {

-

-		if (view != null && depth != null && !depth.isEmpty()) {

-			setPersistency(domain, view, true);

-			setDepth(domain, stereotype, view, depth, true);

-		}

-	}

-

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * 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:
+ *   Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation
+ *   Celine Janssens (ALL4TEC) celine.janssens@all4tec.net - Bug 455311 : Refactor Stereotype Display
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.SetNodeVisibilityCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStyleValueCommand;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.command.SetPersistentViewCommand;
+import org.eclipse.papyrus.uml.diagram.common.util.CommandUtil;
+import org.eclipse.uml2.uml.Stereotype;
+
+/**
+ * This Class regroups the Commands and their execution for the Stereotype Display
+ * 
+ * @author Céline JANSSENS
+ *
+ */
+public final class StereotypeDisplayCommandExecution {
+	/**
+	 * singleton instance
+	 */
+	private static StereotypeDisplayCommandExecution labelHelper;
+	private StereotypeDisplayUtil helper = StereotypeDisplayUtil.getInstance();
+
+	/** Singleton contructor */
+	private StereotypeDisplayCommandExecution() {
+	}
+
+	/**
+	 * Returns the singleton instance of this class
+	 *
+	 * @return the singleton instance.
+	 */
+	public static StereotypeDisplayCommandExecution getInstance() {
+		if (labelHelper == null) {
+			labelHelper = new StereotypeDisplayCommandExecution();
+		}
+		return labelHelper;
+	}
+
+	/**
+	 * Set the visibility of a view
+	 *
+	 * @param view
+	 *            The view on which the visibility has to be set
+	 * @param isVisible
+	 *            True to make the Compartment visible
+	 */
+	public void setVisibility(final TransactionalEditingDomain domain, final View view, final boolean isVisible, final boolean inCommandStack) {
+
+
+		if (!inCommandStack) {
+			class SetVisibilityRunnable implements Runnable {
+
+				private boolean visible;
+
+				/**
+				 * Constructor.
+				 *
+				 */
+				public SetVisibilityRunnable(boolean visible) {
+					this.visible = visible;
+				}
+
+				/**
+				 * @see java.lang.Runnable#run()
+				 *
+				 */
+				@Override
+				public void run() {
+					if (view.isVisible() != visible) {
+						view.setVisible(visible);
+					}
+				}
+
+			}
+			CommandUtil.executeUnsafeCommand(new SetVisibilityRunnable(isVisible), domain);
+		} else {
+			SetNodeVisibilityCommand visibility = new SetNodeVisibilityCommand(domain, view, isVisible);
+			CommandUtil.executeCommandInStack(visibility, domain);
+		}
+	}
+
+
+	/**
+	 * Set the visibility of a view
+	 *
+	 * @param view
+	 *            The view on which the visibility has to be set
+	 * @param isVisible
+	 *            True to make the Compartment visible
+	 */
+	public void setPersistency(final TransactionalEditingDomain domain, final View view, boolean inCommandStack) {
+		if (!inCommandStack) {
+
+			class SetPersistencyRunnable implements Runnable {
+
+				/**
+				 * @see java.lang.Runnable#run()
+				 *
+				 */
+				@Override
+				public void run() {
+					makeViewPersistant(view);
+				}
+
+			}
+			CommandUtil.executeUnsafeCommand(new SetPersistencyRunnable(), domain);
+		} else {
+			SetPersistentViewCommand persitence = new SetPersistentViewCommand(domain, view);
+			CommandUtil.executeCommandInStack(persitence, domain);
+		}
+
+	}
+
+	/**
+	 * @param eContainer
+	 */
+	public void makeViewPersistant(final View view) {
+		if (view != null) {
+			if (view.eContainer() != null && view.eContainer() instanceof View) {
+
+				// Make the Parent Persistent
+				makeViewPersistant((View) view.eContainer());
+				// Move the view from the Transient List to the Persistent Children list
+				if (!(view instanceof Edge)) {
+					((View) view.eContainer()).getPersistedChildren().add(view);
+					((View) view.eContainer()).getTransientChildren().remove(view);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Set the depth Name of the Stereotype Label.
+	 * It uses the NamedStyle to store the depth into a View.
+	 * 
+	 * @param stereotype
+	 *            The Stereotype of the Label that should be modified.
+	 * @param nodeView
+	 *            The view of the element that needs to be updated (i.e. The Class)
+	 * @param depth
+	 *            The Depth value as a string (Can be "none", "full" or a negative number )
+	 */
+	public void setDepth(final TransactionalEditingDomain domain, final Stereotype stereotype, final View nodeView, final String depth, final boolean inCommandStack) {
+		final View label = helper.getStereotypeLabel(nodeView, stereotype);
+
+		Command command = new CustomStyleValueCommand(label, depth, NotationPackage.eINSTANCE.getStringValueStyle(), NotationPackage.eINSTANCE.getStringValueStyle_StringValue(), StereotypeDisplayConstant.STEREOTYPE_LABEL_DEPTH);
+
+		if (inCommandStack) {
+			CommandUtil.executeCommandInStack(command, domain);
+		} else {
+			CommandUtil.executeUnsafeCommand(command, domain);
+		}
+	}
+
+	/**
+	 * This Method is called when the user ask explicitly to display a View.
+	 * Then the node is first set as Persistence and the command is put in the command Stack
+	 * before to set the Visibility as wanted.
+	 * 
+	 * @param domain
+	 *            The Transactional Domain
+	 * @param view
+	 *            The View to make visible
+	 * @param visible
+	 *            True if the View has to be visible, false if the Node should be hidden
+	 *
+	 */
+	public void setUserVisibility(final TransactionalEditingDomain domain, final View view, final boolean visible) {
+		if (view != null && domain != null) {
+			final CompoundCommand compoundCommand = new CompoundCommand("Set Persistency");
+			
+			final SetPersistentViewCommand persitence = new SetPersistentViewCommand(domain, view);
+			compoundCommand.append(persitence);
+			final SetNodeVisibilityCommand visibility = new SetNodeVisibilityCommand(domain, view, visible);
+			compoundCommand.append(visibility);
+			CommandUtil.executeCommandInStack(compoundCommand, domain);
+		}
+	}
+	
+	/**
+	 * This Method is called when the user ask explicitly to display a View.
+	 * The command is put in the command Stack before to set the Visibility as wanted.
+	 * 
+	 * @param domain
+	 *            The Transactional Domain
+	 * @param view
+	 *            The View to make visible
+	 * @param visible
+	 *            True if the View has to be visible, false if the Node should be hidden
+	 *
+	 */
+	public void setUserVisibilityWithoutPersistence(final TransactionalEditingDomain domain, final View view, final boolean visible) {
+		if (view != null && domain != null) {
+			
+			final SetNodeVisibilityCommand visibility = new SetNodeVisibilityCommand(domain, view, visible);
+			CommandUtil.executeCommandInStack(visibility, domain);
+		}
+	}
+
+	/**
+	 * This Method is called when the user ask explicitly to display a View.
+	 * Then the node is first set as Persistence and the command is put in the command Stack
+	 * before to set the Visibility as wanted.
+	 * 
+	 * @param domain
+	 *            The Transactional Domain
+	 * @param view
+	 *            The View to make visible
+	 * @param visible
+	 *            True if the View has to be visible, false if the Node should be hidden
+	 *
+	 */
+	public void setUserDepth(final TransactionalEditingDomain domain, final Stereotype stereotype, final View view, final String depth) {
+		if (view != null && depth != null && !depth.isEmpty()) {
+			setPersistency(domain, view, true);
+			setDepth(domain, stereotype, view, depth, true);
+		}
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayUtil.java
index dfdbda490e5..9f53562261d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/stereotype/display/helper/StereotypeDisplayUtil.java
@@ -469,7 +469,32 @@ public class StereotypeDisplayUtil {
 		return propertyView;

 	}

 

-

+	/**
+	 * Return the associated Property view of a node from the property name.
+	 * 
+	 * @param node Node on which the Stereotype Label is retrieved
+	 * @param stereotype Stereotype Application of the Label to be retrieved.
+	 * @param property Property of the stereotype
+	 * @return associated StereotypeLabel
+	 */
+	public DecorationNode getStereotypePropertyInCompartment(View node, Stereotype stereotype, Property property) {
+		DecorationNode propertyView = null;
+		if ((stereotype != null) && (property != null)) {
+			View compartment = getStereotypeCompartment(node, stereotype);
+			Object obj;
+			if (compartment != null) {
+				Iterator<?> iter = compartment.getChildren().iterator();
+				while (iter.hasNext()) {
+					obj = iter.next();
+					if (isStereotypeProperty(obj) && ((DecorationNode) obj).getElement().equals(property)) {
+						propertyView = (DecorationNode) obj;
+					}
+

+				}
+			}
+		}
+		return propertyView;
+	}
 

 	/**

 	 * Return the associated DecorationNode of a node from it's stereotypeAppplication.

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.classpath
new file mode 100644
index 00000000000..098194ca4b7
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.project b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.project
new file mode 100644
index 00000000000..87f78b5f830
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.nattable.stereotype.display</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..4d72ad12656
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,288 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.settings/org.eclipse.jdt.ui.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..9851dfdb8c7
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF
@@ -0,0 +1,35 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Stereotype Display Table
+Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.stereotype.display;singleton:=true
+Bundle-Version: 1.1.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.nattable.stereotype.display.Activator
+Bundle-Vendor: Eclipse Modeling Project
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
+ org.eclipse.uml2.uml;bundle-version="5.1.0",
+ org.eclipse.papyrus.infra.viewpoints.policy,
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0",
+ org.eclipse.emf.transaction;bundle-version="1.9.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="1.2.0",
+ org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ ca.odell.glazedlists;bundle-version="1.9.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.nattable;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.diagram.core;bundle-version="1.7.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.papyrus.uml.nattable.stereotype.display,
+ org.eclipse.papyrus.uml.nattable.stereotype.display.configuration,
+ org.eclipse.papyrus.uml.nattable.stereotype.display.label.provider,
+ org.eclipse.papyrus.uml.nattable.stereotype.display.manager.axis,
+ org.eclipse.papyrus.uml.nattable.stereotype.display.manager.cell,
+ org.eclipse.papyrus.uml.nattable.stereotype.display.utils
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/about.html b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/build.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/build.properties
new file mode 100644
index 00000000000..d141adec92d
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               config/
+src.includes = about.html
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotype.nattableconfiguration b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotype.nattableconfiguration
new file mode 100644
index 00000000000..ae1114fb012
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotype.nattableconfiguration
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" 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" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="" name="StereotypeDisplayTreeTable" type="PapyrusStereotypeDisplayTreeTable" iconPath="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
+  <styles xsi:type="nattablestyle:TableDisplayStyle" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+  <styles xsi:type="nattablestyle:IntListValueStyle" xmi:id="_ug5fIN3pEeStRPnNv2jObA" name="hiddenCategoriesByDepth">
+    <intListValue>1</intListValue>
+    <intListValue>2</intListValue>
+    <intListValue>3</intListValue>
+  </styles>
+  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.uml.nattable.tester.isumlelement"/>
+  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC" displayIndex="false">
+    <styles xsi:type="nattablestyle:IntValueStyle" name="rowLabelWidth" intValue="250"/>
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" displayIcon="false" displayIsDerived="false" displayType="false" displayMultiplicity="false"/>
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" displayIcon="false" displayIsDerived="false" displayType="false" displayMultiplicity="false"/>
+    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:TreeFillingConfiguration" depth="1" labelProvider="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+      <axisUsedAsAxisProvider xsi:type="nattableaxis:EStructuralFeatureAxis" alias="">
+        <element xsi:type="ecore:EReference" href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View/element"/>
+      </axisUsedAsAxisProvider>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:TreeFillingConfiguration" depth="2" labelProvider="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.operation.labelprovider">
+      <axisUsedAsAxisProvider xsi:type="nattableaxis:EOperationAxis">
+        <element xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/getAppliedStereotypes"/>
+      </axisUsedAsAxisProvider>
+    </ownedAxisConfigurations>
+    <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:TreeFillingConfiguration" depth="3" labelProvider="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.operation.labelprovider">
+      <axisUsedAsAxisProvider xsi:type="nattableaxis:EOperationAxis" alias="">
+        <element xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/getAllAttributes"/>
+      </axisUsedAsAxisProvider>
+    </ownedAxisConfigurations>
+    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.display.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0 //@rowHeaderAxisConfiguration/@ownedAxisConfigurations.1 //@rowHeaderAxisConfiguration/@ownedAxisConfigurations.2"/>
+  </rowHeaderAxisConfiguration>
+  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" displayIndex="false">
+    <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration"/>
+    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.display.properties.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
+  </columnHeaderAxisConfiguration>
+  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="This axis provider provides available columns according to the columns of the table ( features of the object displayed on the other axis)" name="Stereotype display properties axis provider">
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" alias="Name Depth" element="stereotype_display_properties:/nameDepth"/>
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" alias="Display" element="stereotype_display_properties:/isDisplayed"/>
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" alias="In Braces" element="stereotype_display_properties:/isDisplayedInBraces"/>
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" alias="In Comment" element="stereotype_display_properties:/isDisplayedInComment"/>
+    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0" alias="In Compartment" element="stereotype_display_properties:/isDisplayedInCompartment"/>
+  </columnAxisProviders>
+  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/>
+</nattableconfiguration:TableConfiguration>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotypeDisplay.configuration b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotypeDisplay.configuration
new file mode 100644
index 00000000000..59d362a9595
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotypeDisplay.configuration
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration:PapyrusConfiguration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
+    xmi:id="_KIq-4P4UEeSRsNBVzfUrzA">
+  <viewpoints
+      xsi:type="configuration:PapyrusViewpoint"
+      xmi:id="_VGewQP4UEeSRsNBVzfUrzA"
+      name="Default Papyrus Viewpoint">
+    <modelKinds
+        xsi:type="configuration:PapyrusSyncTable"
+        xmi:id="_WC1q0P4UEeSRsNBVzfUrzA"
+        name="StereotypeDisplayTreeTable"
+        icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png"
+        implementationID="PapyrusStereotypeDisplayTreeTable">
+      <modelRules
+          xmi:id="_7k79wP4VEeSRsNBVzfUrzA">
+        <element
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+      </modelRules>
+      <owningRules
+          xmi:id="_AJmbwP4WEeSRsNBVzfUrzA">
+        <element
+            href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+      </owningRules>
+      <categories
+          href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wNb4txhEeOqHvRyiN87hA"/>
+    </modelKinds>
+  </viewpoints>
+  <defaultStakeholder
+      href="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration#_7wLmkdxhEeOqHvRyiN87hA"/>
+  <metamodel
+      href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+</configuration:PapyrusConfiguration>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/icons/aggreg_shared.gif b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/icons/aggreg_shared.gif
new file mode 100644
index 00000000000..efaa877cccc
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/icons/aggreg_shared.gif
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/plugin.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/plugin.xml
new file mode 100644
index 00000000000..1a2dccc39e3
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/plugin.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.papyrus.infra.viewpoints.policy.custom">
+      <contribution
+            file="config/stereotypeDisplay.configuration"
+            original="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration">
+      </contribution>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.nattable.configuration">
+      <configuration
+            file="config/stereotype.nattableconfiguration"
+            type="PapyrusStereotypeDisplayTreeTable">
+      </configuration>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.nattable.axismanager">
+      <axisManager
+            id="org.eclipse.papyrus.uml.nattable.stereotype.display.axis.manager"
+            manager="org.eclipse.papyrus.uml.nattable.stereotype.display.manager.axis.NotationTreeTableAxisManager">
+      </axisManager>
+      <axisManager
+            id="org.eclipse.papyrus.uml.nattable.stereotype.display.properties.axis.manager"
+            manager="org.eclipse.papyrus.uml.nattable.stereotype.display.manager.axis.StereotypeDisplayPropertiesAxisManager">
+      </axisManager>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.nattable.cellmanager">
+      <cellManager
+            id="org.eclipse.papyrus.uml.nattable.stereotype.display.selection.provider"
+            manager="org.eclipse.papyrus.uml.nattable.stereotype.display.manager.cell.TableSelectionProviderCellManager"
+            order="101">
+      </cellManager>
+      <cellManager
+            id="org.eclipse.papyrus.uml.nattable.stereotype.display.properties.manager.cell"
+            manager="org.eclipse.papyrus.uml.nattable.stereotype.display.manager.cell.StereotypeDisplayTreeTableCellManager"
+            order="100">
+      </cellManager>
+      <cellManager
+            id="org.eclipse.papyrus.uml.nattable.stereotype.display.properties.manager.cell.operation.extended.manager"
+            manager="org.eclipse.papyrus.uml.nattable.stereotype.display.label.provider.StereotypeDisplayEMFOperationValueCellManager"
+            order="150">
+      </cellManager>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.nattable.celleditor.configuration">
+      <cellAxisConfiguration
+            class="org.eclipse.papyrus.uml.nattable.stereotype.display.configuration.StereotypeDisplayPropertiesCellEditorConfiguration"
+            order="100">
+      </cellAxisConfiguration>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">
+      <labelProvider
+            priority="10"
+            provider="org.eclipse.papyrus.uml.nattable.stereotype.display.label.provider.StereotypeDisplayHeaderLabelProvider">
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider"></labelProviderContext>
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.nattable.header.labelprovider">
+         </labelProviderContext>
+      </labelProvider>
+      <labelProvider
+            priority="1"
+            provider="org.eclipse.papyrus.uml.nattable.stereotype.display.label.provider.StereotypeDisplaySelectionHeaderLabelProvider">
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+         </labelProviderContext>
+      </labelProvider>
+      <labelProvider
+            priority="1"
+            provider="org.eclipse.papyrus.uml.nattable.stereotype.display.label.provider.StereotypeDisplayPropertyHeaderLabelProvider">
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+         </labelProviderContext>
+         <labelProviderContext
+               context="org.eclipse.papyrus.infra.nattable.header.labelprovider">
+         </labelProviderContext>
+      </labelProvider>
+   </extension>
+
+</plugin>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/pom.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/pom.xml
new file mode 100644
index 00000000000..7a33c3bc507
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.1.0-SNAPSHOT</version>
+		<relativePath>../../../../releng/top-pom-main.xml</relativePath>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.nattable.stereotype.display</artifactId>
+	<groupId>org.eclipse.papyrus</groupId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/Activator.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/Activator.java
new file mode 100644
index 00000000000..eecf51dad00
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/Activator.java
@@ -0,0 +1,55 @@
+package org.eclipse.papyrus.uml.nattable.stereotype.display;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.nattable.stereotype.display"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/** The plug-in's logger */
+	public static LogHelper log;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		log = new LogHelper(plugin);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/configuration/StereotypeDisplayPropertiesCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/configuration/StereotypeDisplayPropertiesCellEditorConfiguration.java
new file mode 100644
index 00000000000..d96fbf8e227
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/configuration/StereotypeDisplayPropertiesCellEditorConfiguration.java
@@ -0,0 +1,170 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.stereotype.display.configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultBooleanDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultDisplayConverter;
+import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
+import org.eclipse.nebula.widgets.nattable.edit.editor.CheckBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.ComboBoxCellEditor;
+import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import org.eclipse.nebula.widgets.nattable.painter.cell.ComboBoxPainter;
+import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
+import org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.painter.CustomCheckBoxPainter;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.uml.nattable.stereotype.display.utils.StereotypeDisplayTreeTableConstants;
+import org.eclipse.uml2.uml.NamedElement;
+
+/**
+ * The cell editor configuration for the stereotype display tree table.
+ */
+public class StereotypeDisplayPropertiesCellEditorConfiguration implements ICellAxisConfiguration {
+
+	private static final String DEPTH_SEPARATOR = "::"; //$NON-NLS-1$
+	
+	/**
+	 * Constructor.
+	 */
+	public StereotypeDisplayPropertiesCellEditorConfiguration() {
+
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationId()
+	 */
+	@Override
+	public String getConfigurationId() {
+		return "PapyrusStereotypeDisplayTreeTable"; //$NON-NLS-1$
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.configuration.IPapyrusNatTableConfiguration#getConfigurationDescription()
+	 */
+	@Override
+	public String getConfigurationDescription() {
+		return "Cell configuration for Stereotype Tree Table"; // //$NON-NLS-1$
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table, java.lang.Object)
+	 */
+	@Override
+	public boolean handles(final Table table, final Object axisElement) {
+		boolean handles = false;
+		Object element = AxisUtils.getRepresentedElement(axisElement);
+		if (element instanceof String) {
+			handles = ((String) element).startsWith(StereotypeDisplayTreeTableConstants.PREFIX);
+		}
+
+		return handles;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.celleditor.config.ICellAxisConfiguration#configureCellEditor(org.eclipse.nebula.widgets.nattable.config.IConfigRegistry, java.lang.Object, java.lang.String)
+	 */
+	@Override
+	public void configureCellEditor(final IConfigRegistry configRegistry, final Object axis, final String configLabel) {
+
+		if (AxisUtils.getRepresentedElement(axis) instanceof String) {
+			String element = (String) AxisUtils.getRepresentedElement(axis);
+
+			String suffixe = element.substring(StereotypeDisplayTreeTableConstants.PREFIX.length(), element.length());
+
+			switch (suffixe) {
+			case StereotypeDisplayTreeTableConstants.IS_DISPLAYED:
+			case StereotypeDisplayTreeTableConstants.IN_BRACE:
+			case StereotypeDisplayTreeTableConstants.IN_COMMENT:
+			case StereotypeDisplayTreeTableConstants.IN_COMPARTMENT:
+				createCheckBox(configRegistry, configLabel);
+				break;
+			case StereotypeDisplayTreeTableConstants.NAME_DEPTH:
+				createCombo(configRegistry, configLabel);
+				break;
+			default:
+				break;
+			}
+		}
+
+
+	}
+
+	/**
+	 * This allow to create the check box editor.
+	 * 
+	 * @param configRegistry The config registry.
+	 * @param configLabel The config label.
+	 */
+	protected void createCheckBox(final IConfigRegistry configRegistry, final String configLabel) {
+		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new CustomCheckBoxPainter(), DisplayMode.NORMAL, configLabel);
+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new CheckBoxCellEditor(), DisplayMode.NORMAL, configLabel);
+		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultBooleanDisplayConverter(), DisplayMode.NORMAL, configLabel);
+	}
+
+	/**
+	 * This allow to create the combo box editor.
+	 * 
+	 * @param configRegistry The config registry.
+	 * @param configLabel The config label.
+	 */
+	protected void createCombo(final IConfigRegistry configRegistry, final String configLabel) {
+		configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, new ComboBoxPainter(), DisplayMode.EDIT, configLabel);
+		IComboBoxDataProvider p = new IComboBoxDataProvider() {
+
+			@Override
+			public List<?> getValues(int columnIndex, int rowIndex) {
+
+				List<String> values = new ArrayList<String>(2);
+				values.add("none"); //$NON-NLS-1$
+
+				INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+				Object row = manager.getRowElement(rowIndex);
+				row = AxisUtils.getRepresentedElement(row);
+				if (row instanceof NamedElement) {
+					String qualifiedName = ((NamedElement) row).getQualifiedName();
+
+					String[] split = qualifiedName.split(DEPTH_SEPARATOR);
+
+					int cpt = -1;
+					for (int i = 0; i < split.length - 1; i++) {
+						values.add(Integer.toString(cpt));
+						cpt--;
+					}
+				}
+
+				values.add("full"); //$NON-NLS-1$
+
+				return values;
+			}
+		};
+
+		configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new ComboBoxCellEditor(p), DisplayMode.EDIT, configLabel);
+		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultDisplayConverter(), DisplayMode.EDIT, configLabel);
+	}
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplayEMFOperationValueCellManager.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplayEMFOperationValueCellManager.java
new file mode 100644
index 00000000000..140b59ecd50
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplayEMFOperationValueCellManager.java
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.stereotype.display.label.provider;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFOperationValueCellManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * The operation value cell manager refined to avoid the non-valid stereotype property.
+ */
+public class StereotypeDisplayEMFOperationValueCellManager extends EMFOperationValueCellManager {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFOperationValueCellManager#doGetValue(java.lang.Object, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 */
+	@Override
+	protected Object doGetValue(final Object columnElement, final Object rowElement, final INattableModelManager tableManager) {
+		final List<Object> objects = organizeAndResolvedObjects(columnElement, rowElement, null);
+		final EObject eobject = (EObject) objects.get(0);
+		final EOperation operation = (EOperation) objects.get(1);
+		if (operation.equals(UMLPackage.Literals.CLASSIFIER___GET_ALL_ATTRIBUTES)) {
+			if (eobject.eClass().getEAllOperations().contains(operation)) {
+				try {
+					if (operation.getEParameters().size() != 0) {
+						return NO_PARAMETER_MESSAGE;
+					} else {
+						Object object = eobject.eInvoke(operation, null);
+
+						// Avoid the non-valid stereotype properties
+						if (object instanceof List<?>) {
+							List<Object> items = new ArrayList<Object>(((List<?>) object).size());
+							for (Object item : (List<?>) object) {
+								if (item instanceof Property && StereotypeUtil.isValidStereotypeProperty((Property) item)) {
+									items.add(item);
+								}
+							}
+							return items;
+						}
+						return object;
+					}
+				} catch (InvocationTargetException e) {
+					return NOT_IMPLEMENTED_MESSAGE;
+				}
+			}
+		}
+		return super.doGetValue(columnElement, rowElement, tableManager);
+	}
+
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplayHeaderLabelProvider.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplayHeaderLabelProvider.java
new file mode 100644
index 00000000000..624f3fa6013
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplayHeaderLabelProvider.java
@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.stereotype.display.label.provider;
+
+import org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;
+import org.eclipse.papyrus.uml.nattable.stereotype.display.utils.StereotypeDisplayTreeTableConstants;
+
+/**
+ * The label provider for the sterotype display column header.
+ */
+public class StereotypeDisplayHeaderLabelProvider extends EMFFeatureHeaderLabelProvider {
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)
+	 */
+	@Override
+	public boolean accept(final Object element) {
+
+		if (element instanceof ILabelProviderContextElementWrapper) {
+			Object wrappedElement = ((ILabelProviderContextElementWrapper) element).getObject();
+			Object object = AxisUtils.getRepresentedElement(wrappedElement);
+			if (object instanceof String) {
+				if (((String) object).startsWith(StereotypeDisplayTreeTableConstants.PREFIX)) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getText(java.lang.Object)
+	 */
+	@Override
+	public String getText(final Object element) {
+		String returnedValue = ""; //$NON-NLS-1$
+		final ILabelProviderContextElementWrapper wrapper = (ILabelProviderContextElementWrapper) element;
+
+		final Object value = getWrappedValue(wrapper);
+		if (value instanceof IAxis && !((IAxis) value).getAlias().isEmpty()) {
+			returnedValue = ((IAxis) value).getAlias();
+		} else {
+			String axisValue = (String) AxisUtils.getRepresentedElement(value);
+			String axisId = axisValue.substring(StereotypeDisplayTreeTableConstants.PREFIX.length());
+			switch (axisId) {
+			case StereotypeDisplayTreeTableConstants.IN_BRACE:
+				returnedValue = StereotypeDisplayTreeTableConstants.IN_BRACE_LABEL;
+				break;
+			case StereotypeDisplayTreeTableConstants.IN_COMMENT:
+				returnedValue = StereotypeDisplayTreeTableConstants.IN_COMMENT_LABEL;
+				break;
+			case StereotypeDisplayTreeTableConstants.IN_COMPARTMENT:
+				returnedValue = StereotypeDisplayTreeTableConstants.IN_COMPARTMENT_LABEL;
+				break;
+			case StereotypeDisplayTreeTableConstants.IS_DISPLAYED:
+				returnedValue = StereotypeDisplayTreeTableConstants.IS_DISPLAYED_LABEL;
+				break;
+			case StereotypeDisplayTreeTableConstants.NAME_DEPTH:
+				returnedValue = StereotypeDisplayTreeTableConstants.NAME_DEPTH_LABEL;
+				break;
+			default:
+				break;
+			}
+		}
+
+		return returnedValue;
+	}
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplayPropertyHeaderLabelProvider.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplayPropertyHeaderLabelProvider.java
new file mode 100644
index 00000000000..9b45c2a801d
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplayPropertyHeaderLabelProvider.java
@@ -0,0 +1,172 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.stereotype.display.label.provider;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+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.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.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
+import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.uml.nattable.messages.Messages;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.uml2.uml.AggregationKind;
+import org.eclipse.uml2.uml.DataType;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.Type;
+
+/**
+ * The label provider for the stereotype property in the stereotype display tree table
+ */
+public class StereotypeDisplayPropertyHeaderLabelProvider extends EMFFeatureHeaderLabelProvider {
+
+	/** The string displayed in the header when the required profile is not avalaible */
+	public static final String REQUIRED_PROFILE_NOT_AVALAIBLE = Messages.StereotypePropertyHeaderLabelProvider_RequiredProfileNotFound;
+
+	/** the icon for the shared aggregation */
+	public static final String AGGREG_SHARED = "icons/aggreg_shared.gif"; //$NON-NLS-1$
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)
+	 */
+	@Override
+	public boolean accept(final Object element) {
+
+		if (element instanceof ILabelProviderContextElementWrapper) {
+			Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+			if (object instanceof IAxis) {
+				object = ((IAxis) object).getElement();
+			}
+			return object instanceof Property && ((Property) object).eContainer() instanceof Stereotype && !(object instanceof EStructuralFeature);
+		}
+		return false;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getText(java.lang.Object)
+	 */
+	@Override
+	public String getText(final Object element) {
+		final LabelProviderCellContextElementWrapper wrapper = (LabelProviderCellContextElementWrapper) element;
+		final IConfigRegistry configRegistry = wrapper.getConfigRegistry();
+		final Object value = getWrappedValue(wrapper);
+		String alias = ""; //$NON-NLS-1$
+		if (value instanceof FeatureAxis) {
+			alias = ((FeatureAxis) value).getAlias();
+		}
+
+		ILabelProviderConfiguration conf = getLabelConfiguration(wrapper);
+
+		String returnedValue = null;
+		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayLabel()) {
+			returnedValue = ""; //$NON-NLS-1$
+		} else {
+			Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+			Property prop = null;
+			if (object instanceof IAxis) {
+				prop = (Property) ((IAxis) object).getElement();
+			}
+
+			if (prop != null) {
+				if (alias != null && !alias.isEmpty()) {
+					returnedValue = alias;
+				} else {
+					returnedValue = prop.getName();// getLabelProviderService(configRegistry).getLabelProvider(prop).getText(prop);
+				}
+				if (conf != null) {
+					if (alias != null && !alias.equals("")) { //$NON-NLS-1$
+						returnedValue = alias;
+					}
+					returnedValue = getText((FeatureLabelProviderConfiguration) conf, configRegistry, returnedValue, prop.getType(), prop.isDerived(), prop.getLower(), prop.getUpper());
+				}
+			}
+		}
+		return returnedValue;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getLabelConfiguration(org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper)
+	 */
+	@Override
+	protected ILabelProviderConfiguration getLabelConfiguration(final LabelProviderCellContextElementWrapper wrapper) {
+		ILabelProviderConfiguration conf = null;
+		final IConfigRegistry configRegistry = wrapper.getConfigRegistry();
+		final INattableModelManager modelManager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
+		final Table table = modelManager.getTable();
+		if (wrapper instanceof LabelProviderCellContextElementWrapper) {
+			LabelStack labels = ((LabelProviderCellContextElementWrapper) wrapper).getConfigLabels();
+			if (labels.hasLabel(GridRegion.COLUMN_HEADER)) {
+				conf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(table);
+			} else if (labels.hasLabel(GridRegion.ROW_HEADER)) {
+				conf = LabelConfigurationManagementUtils.getUsedRowFeatureLabelConfiguration(table);
+			}
+		}
+		return conf;
+	};
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getImage(java.lang.Object)
+	 */
+	@Override
+	public Image getImage(final Object element) {
+		ILabelProviderConfiguration conf = getLabelConfiguration((LabelProviderCellContextElementWrapper) element);
+		if (conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration) conf).isDisplayIcon()) {
+			return null;
+		}
+
+		Object object = ((ILabelProviderContextElementWrapper) element).getObject();
+		Property prop = null;
+		if (object instanceof IAxis) {
+			prop = (Property) ((IAxis) object).getElement();
+		}
+
+		if (prop != null) {
+			final Type type = prop.getType();
+			if (type instanceof DataType) {
+				return EStructuralFeatureImageRegistry.getAttributeIcon();
+			}
+			switch (prop.getAggregation().getValue()) {
+			case AggregationKind.NONE:
+				return EStructuralFeatureImageRegistry.getLinkIcon();
+			case AggregationKind.COMPOSITE:
+				return EStructuralFeatureImageRegistry.getAggregIcon();
+			case AggregationKind.SHARED:
+				return Activator.getDefault().getImage(org.eclipse.papyrus.uml.nattable.Activator.PLUGIN_ID, AGGREG_SHARED);
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplaySelectionHeaderLabelProvider.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplaySelectionHeaderLabelProvider.java
new file mode 100644
index 00000000000..9200cbc993a
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/label/provider/StereotypeDisplaySelectionHeaderLabelProvider.java
@@ -0,0 +1,86 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.stereotype.display.label.provider;
+
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;
+import org.eclipse.papyrus.uml.nattable.stereotype.display.utils.StereotypeDisplayTreeTableConstants;
+
+/**
+ * The label provider for the selection in the stereotype display tree table.
+ */
+public class StereotypeDisplaySelectionHeaderLabelProvider extends AbstractNattableCellLabelProvider {
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)
+	 */
+	@Override
+	public boolean accept(final Object element) {
+
+		if (element instanceof ILabelProviderContextElementWrapper) {
+			Object wrappedElement = ((ILabelProviderContextElementWrapper) element).getObject();
+			Object object = AxisUtils.getRepresentedElement(wrappedElement);
+			if (object instanceof TreeFillingConfiguration) {
+				IAxis axis = ((TreeFillingConfiguration) object).getAxisUsedAsAxisProvider();
+				Object representedelement = AxisUtils.getRepresentedElement(axis);
+				if(representedelement instanceof String){
+					if (((String) representedelement).startsWith(StereotypeDisplayTreeTableConstants.GMF_CUSTOM_PREFIX)) {
+						return true;
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getText(java.lang.Object)
+	 */
+	@Override
+	public String getText(final Object element) {
+		String result = ""; //$NON-NLS-1$
+		final ILabelProviderContextElementWrapper wrapper = (ILabelProviderContextElementWrapper) element;
+		
+		Object object = wrapper.getObject();
+		if (object instanceof ITreeItemAxis) {
+			object = AxisUtils.getRepresentedElement(object);
+			if (object instanceof TreeFillingConfiguration) {
+				IAxis axis = ((TreeFillingConfiguration) object).getAxisUsedAsAxisProvider();
+				if (axis instanceof IAxis && !((IAxis) axis).getAlias().isEmpty()) {
+					result = ((IAxis) axis).getAlias();
+				}else{
+					Object representedelement = AxisUtils.getRepresentedElement(axis);
+					if(representedelement instanceof String){
+						if (((String) representedelement).startsWith(StereotypeDisplayTreeTableConstants.GMF_CUSTOM_PREFIX) && ((String) representedelement).endsWith(StereotypeDisplayTreeTableConstants.SELECTION)){
+							result = "Selection"; //$NON-NLS-1$
+						}
+					}
+				}
+					
+			}
+		}
+
+		return result;
+	}
+	
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/axis/NotationTreeTableAxisManager.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/axis/NotationTreeTableAxisManager.java
new file mode 100644
index 00000000000..722bc555944
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/axis/NotationTreeTableAxisManager.java
@@ -0,0 +1,292 @@
+
+package org.eclipse.papyrus.uml.nattable.stereotype.display.manager.axis;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.nattable.manager.axis.EObjectTreeAxisManagerForEventList;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.GMFUnsafe;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManagerForEventList;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.tools.util.WorkbenchPartHelper;
+import org.eclipse.papyrus.uml.nattable.stereotype.display.Activator;
+import org.eclipse.ui.IEditorPart;
+
+public class NotationTreeTableAxisManager extends EObjectTreeAxisManagerForEventList
+		implements IAxisManagerForEventList {
+
+	public NotationTreeTableAxisManager() {
+
+	}
+
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#fillChildrenForSemanticElement(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
+	 *
+	 * @param axis
+	 */
+	@Override
+	protected void fillChildrenForSemanticElement(ITreeItemAxis axis) {
+
+		super.fillChildrenForSemanticElement(axis);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#fillChildrenForTreeFillingConfiguration(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
+	 *
+	 * @param axis
+	 */
+	@Override
+	protected void fillChildrenForTreeFillingConfiguration(ITreeItemAxis axis) {
+		// CEJ Auto-generated method stub
+		super.fillChildrenForTreeFillingConfiguration(axis);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#fillListWithGrandSon(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
+	 *
+	 * @param element
+	 */
+	@Override
+	public void fillListWithGrandSon(ITreeItemAxis element) {
+
+		super.fillListWithGrandSon(element);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#fillListWithRoots()
+	 *
+	 */
+	@Override
+	public void fillListWithRoots() {
+		if (null != getTableEditingDomain() && getRepresentedContentProvider().getAxis().isEmpty()) {
+			// we are creating the table and not opening an existing table!
+			IEditorPart part = WorkbenchPartHelper.getCurrentActiveEditorPart();
+			DiagramEditor editor = null;
+			if (part instanceof IAdaptable) {
+				editor = part.getAdapter(DiagramEditor.class);
+			} else if (part instanceof DiagramEditor) {
+				editor = (DiagramEditor) part;
+			}
+			Collection<Object> selectionList = new ArrayList<Object>();
+			if (editor != null && !editor.getDiagramGraphicalViewer().getSelection().isEmpty()) {
+				IStructuredSelection selection = (IStructuredSelection) editor.getDiagramGraphicalViewer().getSelection();
+				Iterator<?> iter = selection.iterator();
+				while (iter.hasNext()) {
+					Object obj = iter.next();
+					if (obj instanceof IAdaptable) {
+						View v = ((IAdaptable) obj).getAdapter(View.class);
+						if (v != null) {
+							selectionList.add(v);
+						}
+					}
+					if (obj instanceof View) {
+						selectionList.add((View) obj);
+					}
+				}
+			}
+
+			final Command cmd = getAddAxisCommand(getTableEditingDomain(), selectionList);
+			try {
+				GMFUnsafe.write(getTableEditingDomain(), cmd);
+			} catch (InterruptedException e) {
+				Activator.log.error(e);
+			} catch (RollbackException e) {
+				Activator.log.error(e);
+			}
+			// because event will be propagated and children will be setted!
+			return;
+		}
+		super.fillListWithRoots();
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#isAlreadyManaged(java.lang.Object)
+	 *
+	 * @param object
+	 * @return
+	 */
+	@Override
+	public boolean isAlreadyManaged(Object object) {
+
+		return super.isAlreadyManaged(object);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#updateManagedList(java.util.List, java.util.List)
+	 *
+	 * @param toAdd
+	 * @param toRemove
+	 */
+	@Override
+	protected void updateManagedList(List<Object> toAdd, List<Object> toRemove) {
+
+		super.updateManagedList(toAdd, toRemove);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#fillListWithChildren(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
+	 *
+	 * @param parentAxis
+	 */
+	@Override
+	public void fillListWithChildren(ITreeItemAxis parentAxis) {
+
+		super.fillListWithChildren(parentAxis);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#manageSetNotification(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void manageSetNotification(Notification notification) {
+
+		super.manageSetNotification(notification);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#manageUnsetNotification(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void manageUnsetNotification(Notification notification) {
+
+		super.manageUnsetNotification(notification);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#manageAddITreeItemAxisForSemanticElement(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
+	 *
+	 * @param axis
+	 */
+	@Override
+	protected void manageAddITreeItemAxisForSemanticElement(ITreeItemAxis axis) {
+
+		super.manageAddITreeItemAxisForSemanticElement(axis);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#manageAddNotification(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void manageAddNotification(Notification notification) {
+		// CEJ Auto-generated method stub
+		super.manageAddNotification(notification);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#manageAddManyNotification(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void manageAddManyNotification(Notification notification) {
+		// CEJ Auto-generated method stub
+		super.manageAddManyNotification(notification);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#manageMoveNotification(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void manageMoveNotification(Notification notification) {
+		// CEJ Auto-generated method stub
+		super.manageMoveNotification(notification);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#manageRemoveITreeItemAxisForSemanticElement(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
+	 *
+	 * @param axis
+	 */
+	@Override
+	protected void manageRemoveITreeItemAxisForSemanticElement(ITreeItemAxis axis) {
+		// CEJ Auto-generated method stub
+		super.manageRemoveITreeItemAxisForSemanticElement(axis);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#manageRemoveNotification(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void manageRemoveNotification(Notification notification) {
+		// CEJ Auto-generated method stub
+		super.manageRemoveNotification(notification);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#manageRemoveSemanticElement(java.lang.Object)
+	 *
+	 * @param object
+	 */
+	@Override
+	protected void manageRemoveSemanticElement(Object object) {
+		// CEJ Auto-generated method stub
+		super.manageRemoveSemanticElement(object);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#manageRemoveManyNotification(org.eclipse.emf.common.notify.Notification)
+	 *
+	 * @param notification
+	 */
+	@Override
+	protected void manageRemoveManyNotification(Notification notification) {
+		// CEJ Auto-generated method stub
+		super.manageRemoveManyNotification(notification);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#updateChildren(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis)
+	 *
+	 * @param semanticElementRepresentation
+	 */
+	@Override
+	protected void updateChildren(ITreeItemAxis semanticElementRepresentation) {
+		// CEJ Auto-generated method stub
+		super.updateChildren(semanticElementRepresentation);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#updateSemanticElement(java.lang.Object)
+	 *
+	 * @param semanticElement
+	 */
+	@Override
+	protected void updateSemanticElement(Object semanticElement) {
+		// CEJ Auto-generated method stub
+		super.updateSemanticElement(semanticElement);
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractTreeAxisManagerForEventList#managedHideShowCategoriesForDepth(java.util.List, java.util.List)
+	 *
+	 * @param depthToHide
+	 * @param depthToShow
+	 */
+	@Override
+	public void managedHideShowCategoriesForDepth(List<Integer> depthToHide, List<Integer> depthToShow) {
+		// CEJ Auto-generated method stub
+		super.managedHideShowCategoriesForDepth(depthToHide, depthToShow);
+	}
+
+
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/axis/StereotypeDisplayPropertiesAxisManager.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/axis/StereotypeDisplayPropertiesAxisManager.java
new file mode 100644
index 00000000000..6f8d53ab48c
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/axis/StereotypeDisplayPropertiesAxisManager.java
@@ -0,0 +1,37 @@
+package org.eclipse.papyrus.uml.nattable.stereotype.display.manager.axis;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager;
+
+public class StereotypeDisplayPropertiesAxisManager extends AbstractAxisManager {
+
+	public StereotypeDisplayPropertiesAxisManager() {
+		// CEJ Auto-generated constructor stub
+	}
+
+	@Override
+	public boolean isSlave() {
+		// CEJ Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean isDynamic() {
+
+		return false;
+	}
+
+	@Override
+	public boolean canDestroyAxisElement(Integer axisIndex) {
+
+		return false;
+	}
+
+	@Override
+	public Command getDestroyAxisElementCommand(TransactionalEditingDomain domain, Integer axisPosition) {
+		// CEJ Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/StereotypeDisplayTreeTableCellManager.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/StereotypeDisplayTreeTableCellManager.java
new file mode 100644
index 00000000000..25df2e07b4b
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/StereotypeDisplayTreeTableCellManager.java
@@ -0,0 +1,213 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.stereotype.display.manager.cell;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.converter.AbstractStringValueConverter;
+import org.eclipse.papyrus.uml.nattable.stereotype.display.utils.StereotypeDisplayTreeTableConstants;
+import org.eclipse.papyrus.uml.nattable.stereotype.display.utils.StereotypeDisplayTreeTableHelper;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Stereotype;
+
+/**
+ * The stereotype display tree table cell manager.
+ */
+public class StereotypeDisplayTreeTableCellManager implements ICellManager {
+
+	/**
+	 * The helper class instance.
+	 */
+	private StereotypeDisplayTreeTableHelper helper = StereotypeDisplayTreeTableHelper.getInstance();
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#handles(java.lang.Object, java.lang.Object)
+	 */
+	@Override
+	public boolean handles(final Object columnElement, final Object rowElement) {
+		boolean handles = false;
+		Object element = AxisUtils.getRepresentedElement(columnElement);
+		if (element instanceof String) {
+			handles = ((String) element).startsWith(StereotypeDisplayTreeTableConstants.PREFIX);
+		}
+
+		return handles;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getValue(java.lang.Object, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 */
+	@Override
+	public Object getValue(final Object columnElement, final Object rowElement, final INattableModelManager tableManager) {
+		Object result = null;
+		Object element = AxisUtils.getRepresentedElement(columnElement);
+		
+		if (element instanceof String) {
+			String shortElement = StereotypeDisplayTreeTableHelper.getInstance().getShortValue(element);
+			switch (shortElement) {
+				case StereotypeDisplayTreeTableConstants.NAME_DEPTH:
+					result = helper.getDepthValue(rowElement);
+					break;
+				case StereotypeDisplayTreeTableConstants.IS_DISPLAYED:
+					result = helper.getDisplayedValue(rowElement);
+					break;
+				case StereotypeDisplayTreeTableConstants.IN_BRACE:
+					result = helper.getBraceValue(rowElement);
+					break;
+				case StereotypeDisplayTreeTableConstants.IN_COMMENT:
+					result = helper.getCommentValue(rowElement);
+					break;
+				case StereotypeDisplayTreeTableConstants.IN_COMPARTMENT:
+					result = helper.getCompartmentValue(rowElement);
+					break;
+				default:
+					break;
+			}
+		}
+		return result;
+
+
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#setValue(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Object, java.lang.Object, java.lang.Object,
+	 *      org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 */
+	@Override
+	public void setValue(final TransactionalEditingDomain domain, final Object columnElement, final Object rowElement, final Object newValue, final INattableModelManager tableManager) {
+		Object element = AxisUtils.getRepresentedElement(columnElement);
+
+		if (element instanceof String) {
+			String shortElement = StereotypeDisplayTreeTableHelper.getInstance().getShortValue(element);
+			switch (shortElement) {
+			case StereotypeDisplayTreeTableConstants.NAME_DEPTH:
+				helper.setDepthValue(domain, rowElement, newValue);
+				break;
+			case StereotypeDisplayTreeTableConstants.IS_DISPLAYED:
+				helper.setDisplayedValue(domain, rowElement, newValue);
+				break;
+			case StereotypeDisplayTreeTableConstants.IN_BRACE:
+				helper.setBraceValue(domain, rowElement, newValue);
+				break;
+			case StereotypeDisplayTreeTableConstants.IN_COMMENT:
+				helper.setCommentValue(domain, rowElement, newValue);
+				break;
+			case StereotypeDisplayTreeTableConstants.IN_COMPARTMENT:
+				helper.setCompartmentValue(domain, rowElement, newValue);
+				break;
+			default:
+				break;
+
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#isCellEditable(java.lang.Object, java.lang.Object)
+	 */
+	@Override
+	public boolean isCellEditable(final Object columnElement, final Object rowElement) {
+		boolean result = true;
+		
+		// Disable the isVisible for the properties
+		Object column = AxisUtils.getRepresentedElement(columnElement);
+		if (column instanceof String) {
+			String shortElement = StereotypeDisplayTreeTableHelper.getInstance().getShortValue(column);
+			
+			if(StereotypeDisplayTreeTableConstants.IS_DISPLAYED.equals(shortElement)){
+				Object row = AxisUtils.getRepresentedElement(rowElement);
+				
+				if(row instanceof Property){
+					result = false;
+				}
+			}
+			
+			if(StereotypeDisplayTreeTableConstants.NAME_DEPTH.equals(shortElement)){
+				Object row = AxisUtils.getRepresentedElement(rowElement);
+				
+				if(!(row instanceof Stereotype)){
+					result = false;
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getSetValueCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Object, java.lang.Object, java.lang.Object,
+	 *      org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 */
+	@Override
+	public Command getSetValueCommand(final TransactionalEditingDomain domain, final Object columnElement, final Object rowElement, final Object newValue, final INattableModelManager tableManager) {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getSetStringValueCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Object, java.lang.Object, java.lang.String,
+	 *      org.eclipse.papyrus.infra.tools.converter.AbstractStringValueConverter, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 */
+	@Override
+	public Command getSetStringValueCommand(final TransactionalEditingDomain domain, final Object columnElement, final Object rowElement, final String newValue, final AbstractStringValueConverter valueConverter, final INattableModelManager tableManager) {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getOrCreateStringValueConverterClass(org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager, java.util.Map, java.lang.String)
+	 */
+	@Override
+	public AbstractStringValueConverter getOrCreateStringValueConverterClass(final INattableModelManager tableManager, final Map<Class<? extends AbstractStringValueConverter>, AbstractStringValueConverter> existingConverters, final String multiValueSeparator) {
+		return null;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#isCellEditable(java.lang.Object, java.lang.Object, java.util.Map)
+	 */
+	@Override
+	public boolean isCellEditable(final Object columnElement, final Object rowElement, final Map<?, ?> sharedMap) {
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#setStringValue(java.lang.Object, java.lang.Object, java.lang.String, org.eclipse.papyrus.infra.tools.converter.AbstractStringValueConverter,
+	 *      org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager, java.util.Map)
+	 */
+	@Override
+	public void setStringValue(final Object columnElement, final Object rowElement, final String valueAsString, final AbstractStringValueConverter valueConverter, final INattableModelManager tableManager, final Map<?, ?> sharedMap) {
+		// Nothing to do
+	}
+
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/TableSelectionProviderCellManager.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/TableSelectionProviderCellManager.java
new file mode 100644
index 00000000000..43e400d0eed
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/manager/cell/TableSelectionProviderCellManager.java
@@ -0,0 +1,158 @@
+package org.eclipse.papyrus.uml.nattable.stereotype.display.manager.cell;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.infra.tools.converter.AbstractStringValueConverter;
+import org.eclipse.papyrus.infra.tools.util.WorkbenchPartHelper;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * Used to get Rows in the Stereotype Display Tree Table. From the Selection.
+ *
+ */
+public class TableSelectionProviderCellManager implements ICellManager {
+
+
+	private final static String SELECTION_VIEW = "gmf_custom:/diagramSelectionView"; // $NON-NLS-0$
+
+	@Override
+	public boolean handles(Object columnElement, Object rowElement) {
+		return SELECTION_VIEW.equals(AxisUtils.getRepresentedElement(columnElement));
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getValue(java.lang.Object, java.lang.Object, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @param tableManager
+	 * @return
+	 */
+	@Override
+	public Object getValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {
+		return EMPTY_STRING;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#setValue(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Object, java.lang.Object, java.lang.Object,
+	 *      org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 *
+	 * @param domain
+	 * @param columnElement
+	 * @param rowElement
+	 * @param newValue
+	 * @param tableManager
+	 */
+	@Override
+	public void setValue(TransactionalEditingDomain domain, Object columnElement, Object rowElement, Object newValue, INattableModelManager tableManager) {
+		// nothing to do
+
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#isCellEditable(java.lang.Object, java.lang.Object)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @return
+	 */
+	@Override
+	public boolean isCellEditable(Object columnElement, Object rowElement) {
+
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getSetValueCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Object, java.lang.Object, java.lang.Object,
+	 *      org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 *
+	 * @param domain
+	 * @param columnElement
+	 * @param rowElement
+	 * @param newValue
+	 * @param tableManager
+	 * @return
+	 */
+	@Override
+	public Command getSetValueCommand(TransactionalEditingDomain domain, Object columnElement, Object rowElement, Object newValue, INattableModelManager tableManager) {
+
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getSetStringValueCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, java.lang.Object, java.lang.Object, java.lang.String,
+	 *      org.eclipse.papyrus.infra.tools.converter.AbstractStringValueConverter, org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager)
+	 *
+	 * @param domain
+	 * @param columnElement
+	 * @param rowElement
+	 * @param newValue
+	 * @param valueConverter
+	 * @param tableManager
+	 * @return
+	 */
+	@Override
+	public Command getSetStringValueCommand(TransactionalEditingDomain domain, Object columnElement, Object rowElement, String newValue, AbstractStringValueConverter valueConverter, INattableModelManager tableManager) {
+
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#getOrCreateStringValueConverterClass(org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager, java.util.Map, java.lang.String)
+	 *
+	 * @param tableManager
+	 * @param existingConverters
+	 * @param multiValueSeparator
+	 * @return
+	 */
+	@Override
+	public AbstractStringValueConverter getOrCreateStringValueConverterClass(INattableModelManager tableManager, Map<Class<? extends AbstractStringValueConverter>, AbstractStringValueConverter> existingConverters, String multiValueSeparator) {
+
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#isCellEditable(java.lang.Object, java.lang.Object, java.util.Map)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @param sharedMap
+	 * @return
+	 */
+	@Override
+	public boolean isCellEditable(Object columnElement, Object rowElement, Map<?, ?> sharedMap) {
+
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager#setStringValue(java.lang.Object, java.lang.Object, java.lang.String, org.eclipse.papyrus.infra.tools.converter.AbstractStringValueConverter,
+	 *      org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager, java.util.Map)
+	 *
+	 * @param columnElement
+	 * @param rowElement
+	 * @param valueAsString
+	 * @param valueConverter
+	 * @param tableManager
+	 * @param sharedMap
+	 */
+	@Override
+	public void setStringValue(Object columnElement, Object rowElement, String valueAsString, AbstractStringValueConverter valueConverter, INattableModelManager tableManager, Map<?, ?> sharedMap) {
+		// nothing to do
+
+	}
+
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/utils/StereotypeDisplayTreeTableConstants.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/utils/StereotypeDisplayTreeTableConstants.java
new file mode 100644
index 00000000000..5326beb3d09
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/utils/StereotypeDisplayTreeTableConstants.java
@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.stereotype.display.utils;
+
+/**
+ * The constants uses for the stereotype display tree table.
+ */
+public class StereotypeDisplayTreeTableConstants {
+
+	public final static String NAME_DEPTH = "nameDepth"; //$NON-NLS-1$
+	public final static String IS_DISPLAYED = "isDisplayed"; //$NON-NLS-1$
+	public final static String IN_COMMENT = "isDisplayedInComment"; //$NON-NLS-1$
+	public final static String IN_COMPARTMENT = "isDisplayedInCompartment"; //$NON-NLS-1$
+	public final static String IN_BRACE = "isDisplayedInBraces"; //$NON-NLS-1$
+	public final static String SELECTION = "selection"; //$NON-NLS-1$
+
+	public final static String PREFIX = "stereotype_display_properties:/"; //$NON-NLS-1$
+	public final static String GMF_CUSTOM_PREFIX = "gmf_custom:/"; //$NON-NLS-1$
+	
+	public final static String NAME_DEPTH_LABEL = "Name Depth"; //$NON-NLS-1$
+	public final static String IS_DISPLAYED_LABEL = "Visible"; //$NON-NLS-1$
+	public final static String IN_COMMENT_LABEL = "In Comment"; //$NON-NLS-1$
+	public final static String IN_COMPARTMENT_LABEL = "In Compartment"; //$NON-NLS-1$
+	public final static String IN_BRACE_LABEL = "in Brace"; //$NON-NLS-1$
+
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/utils/StereotypeDisplayTreeTableHelper.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/utils/StereotypeDisplayTreeTableHelper.java
new file mode 100644
index 00000000000..2d1f921edc2
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/src/org/eclipse/papyrus/uml/nattable/stereotype/display/utils/StereotypeDisplayTreeTableHelper.java
@@ -0,0 +1,428 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ *   Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.stereotype.display.utils;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.DecorationNode;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution;
+import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayUtil;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Stereotype;
+
+/**
+ * The helper for the stereotype display tree table.
+ */
+public class StereotypeDisplayTreeTableHelper {
+
+	/**
+	 * The empty string.
+	 */
+	private static final String EMPTY_STRING = ""; // $NON-NLS-1$
+
+	
+	/**
+	 * The singleton instance.
+	 */
+	private StereotypeDisplayUtil helper = StereotypeDisplayUtil.getInstance();
+	
+	/**
+	 * The stereotype display tree table helper.
+	 */
+	private static StereotypeDisplayTreeTableHelper labelHelper;
+
+
+	/**
+	 * Default Constructor.
+	 */
+	private StereotypeDisplayTreeTableHelper() {
+	}
+
+	/**
+	 * Returns the singleton instance of this class
+	 *
+	 * @return the singleton instance.
+	 */
+	public static StereotypeDisplayTreeTableHelper getInstance() {
+		if (labelHelper == null) {
+			labelHelper = new StereotypeDisplayTreeTableHelper();
+		}
+		return labelHelper;
+	}
+
+	/**
+	 * Get the short value (without prefix).
+	 * 
+	 * @param name The name.
+	 * @return The short value.
+	 */
+	public String getShortValue(final Object name) {
+		String shortName = EMPTY_STRING;
+		if (name instanceof String) {
+			shortName = ((String) name).substring(StereotypeDisplayTreeTableConstants.PREFIX.length(), ((String) name).length());
+		}
+
+		return shortName;
+	}
+
+	/**
+	 * Get the depth value.
+	 * 
+	 * @param rowElement The row element.
+	 * @return The delpth value.
+	 */
+	public Object getDepthValue(final Object rowElement) {
+		Object row = AxisUtils.getRepresentedElement(rowElement);
+
+		if (rowElement instanceof ITreeItemAxis) {
+			// Depth 2
+			if (row instanceof Stereotype) {
+				Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent());
+
+				final View label = helper.getStereotypeLabel((View) parent, (Stereotype) row);
+				if (label instanceof DecorationNode) {
+					return helper.getDepth((DecorationNode) label);
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Set the delpth value.
+	 * 
+	 * @param domain The transactional editing domain.
+	 * @param rowElement The row element.
+	 * @param newValue The value to set.
+	 */
+	public void setDepthValue(final TransactionalEditingDomain domain, final Object rowElement, final Object newValue) {
+		Object row = AxisUtils.getRepresentedElement(rowElement);
+
+		// Depth 2
+		if (row instanceof Stereotype) {
+			Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent());
+			if (parent instanceof View) {
+				if (newValue instanceof String) {
+					StereotypeDisplayCommandExecution.getInstance().setDepth(domain, (Stereotype) row, (View) parent, (String) newValue, true);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the displayed value.
+	 * 
+	 * @param rowElement The row element.
+	 * @return The displayed value.
+	 */
+	public Object getDisplayedValue(final Object rowElement) {
+		Object row = AxisUtils.getRepresentedElement(rowElement);
+		if (rowElement instanceof ITreeItemAxis) {
+
+			// Depth 1
+			if (row instanceof Node) {
+				return ICellManager.EMPTY_STRING;
+			}
+
+			// Depth 2
+			if (row instanceof Stereotype) {
+				Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent());
+
+				View propertyLabel = helper.getStereotypeLabel((View) parent, (Stereotype) row);
+				if (null != propertyLabel) {
+					return propertyLabel.isVisible();
+				}
+			}
+
+			// Depth 3
+			if (row instanceof Property) {
+				return ICellManager.EMPTY_STRING;
+			}
+		}
+
+		return Boolean.FALSE;
+	}
+
+	/**
+	 * Set the displayed value.
+	 * 
+	 * @param domain The transactional editing domain.
+	 * @param rowElement The row element.
+	 * @param newValue The value to set.
+	 */
+	public void setDisplayedValue(final TransactionalEditingDomain domain, final Object rowElement, final Object newValue) {
+		Object row = AxisUtils.getRepresentedElement(rowElement);
+
+		// Depth 2
+		if (row instanceof Stereotype) {
+			Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent());
+			if (parent instanceof View) {
+				if (newValue instanceof Boolean) {
+					View propertyLabel = helper.getStereotypeLabel((View) parent, (Stereotype) row);
+					StereotypeDisplayCommandExecution.getInstance().setUserVisibility(domain, propertyLabel, (Boolean) newValue);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the brace value.
+	 * 
+	 * @param rowElement The row element.
+	 * @return The brace value.
+	 */
+	public Object getBraceValue(final Object rowElement) {
+		Object row = AxisUtils.getRepresentedElement(rowElement);
+		if (rowElement instanceof ITreeItemAxis) {
+
+			// Depth 1
+			if (row instanceof Node) {
+				return ICellManager.EMPTY_STRING;
+			}
+
+			// Depth 2
+			if (row instanceof Stereotype) {
+				Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent());
+				if (parent instanceof View) {
+
+					View brace = helper.getStereotypeBraceCompartment((View) parent, (Stereotype) row);
+					if (null != brace) {
+						return brace.isVisible();
+					}
+				}
+			}
+
+			// Depth 3
+			if (row instanceof Property) {
+				Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent().getParent().getParent());
+				Object stereo = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent());
+
+				if (parent instanceof View) {
+					View brace = helper.getStereotypePropertyInBrace((View) parent, (Stereotype) stereo, (Property) row);
+					if (null != brace) {
+						return brace.isVisible();
+					}
+				}
+			}
+		}
+
+		return Boolean.FALSE;
+	}
+
+	/**
+	 * Set the brace value.
+	 * 
+	 * @param domain The transactional editing domain.
+	 * @param rowElement The row element.
+	 * @param newValue The value to set.
+	 */
+	public void setBraceValue(final TransactionalEditingDomain domain, final Object rowElement, final Object newValue) {
+		Object row = AxisUtils.getRepresentedElement(rowElement);
+
+		// Depth 2
+		if (row instanceof Stereotype) {
+			Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent());
+			if (parent instanceof View) {
+				if (newValue instanceof Boolean) {
+					View brace = helper.getStereotypeBraceCompartment((View) parent, (Stereotype) row);
+					StereotypeDisplayCommandExecution.getInstance().setUserVisibility(domain, brace, (Boolean) newValue);
+				}
+			}
+		}
+
+		// Depth 3
+		if (row instanceof Property) {
+			Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent().getParent().getParent());
+			Object stereo = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent());
+
+			if (parent instanceof View) {
+				if (stereo instanceof Stereotype) {
+					if (newValue instanceof Boolean) {
+						View brace = helper.getStereotypePropertyInBrace((View) parent, (Stereotype) stereo, (Property) row);
+						StereotypeDisplayCommandExecution.getInstance().setUserVisibility(domain, brace, (Boolean) newValue);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the comment value.
+	 * 
+	 * @param rowElement The row element.
+	 * @return The comment value.
+	 */
+	public Object getCommentValue(final Object rowElement) {
+		Object row = AxisUtils.getRepresentedElement(rowElement);
+		if (rowElement instanceof ITreeItemAxis) {
+
+			// Depth 1
+			if (row instanceof Node) {
+				return ICellManager.EMPTY_STRING;
+			}
+
+			// Depth 2
+			if (row instanceof Stereotype) {
+				Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent());
+				if (parent instanceof View) {
+
+					View comment = helper.getStereotypeComment((View) parent);
+					if (null != comment) {
+						return comment.isVisible();
+					}
+				}
+			}
+
+			// Depth 3
+			if (row instanceof Property) {
+				Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent().getParent().getParent());
+				Object stereo = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent());
+
+				if (parent instanceof View) {
+					View comment = helper.getStereotypePropertyInComment((View) parent, (Stereotype) stereo, (Property) row);
+					if (null != comment) {
+						return comment.isVisible();
+					}
+				}
+			}
+		}
+
+		return Boolean.FALSE;
+	}
+
+	/**
+	 * Set the comment value.
+	 * 
+	 * @param domain The transactional editing domain.
+	 * @param rowElement The row element.
+	 * @param newValue The value to set.
+	 */
+	public void setCommentValue(final TransactionalEditingDomain domain, final Object rowElement, final Object newValue) {
+		Object row = AxisUtils.getRepresentedElement(rowElement);
+
+		// Depth 2
+		if (row instanceof Stereotype) {
+			Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent());
+			if (parent instanceof View) {
+				if (newValue instanceof Boolean) {
+					View comment = helper.getStereotypeComment((View) parent);
+					StereotypeDisplayCommandExecution.getInstance().setUserVisibility(domain, comment, (Boolean) newValue);
+					// The comment compartment will be displayed in the same time
+					View compartment = helper.getStereotypeCompartment(comment, (Stereotype) row);
+					StereotypeDisplayCommandExecution.getInstance().setUserVisibilityWithoutPersistence(domain, compartment, (Boolean) newValue);
+				}
+			}
+		}
+
+		// Depth 3
+		if (row instanceof Property) {
+			Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent().getParent().getParent());
+			Object stereo = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent());
+
+			if (parent instanceof View) {
+				if (stereo instanceof Stereotype) {
+					if (newValue instanceof Boolean) {
+						View commentProperty = helper.getStereotypePropertyInComment((View) parent, (Stereotype) stereo, (Property) row);
+						StereotypeDisplayCommandExecution.getInstance().setUserVisibility(domain, commentProperty, (Boolean) newValue);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the compartment value.
+	 * 
+	 * @param rowElement The row element.
+	 * @return The compartment value.
+	 */
+	public Object getCompartmentValue(final Object rowElement) {
+		Object row = AxisUtils.getRepresentedElement(rowElement);
+		if (rowElement instanceof ITreeItemAxis) {
+
+			// Depth 1
+			if (row instanceof Node) {
+				return ICellManager.EMPTY_STRING;
+			}
+
+			// Depth 2
+			if (row instanceof Stereotype) {
+				Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent());
+				if (parent instanceof View) {
+
+					View compartment = helper.getStereotypeCompartment((View) parent, (Stereotype) row);
+					if (null != compartment) {
+						return compartment.isVisible();
+					}
+				}
+			}
+
+			// Depth 3
+			if (row instanceof Property) {
+				Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent().getParent().getParent());
+				Object stereo = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent());
+
+				if (parent instanceof View) {
+					View compartment = helper.getStereotypePropertyInCompartment((View) parent, (Stereotype) stereo, (Property) row);
+					if (null != compartment) {
+						return compartment.isVisible();
+					}
+				}
+			}
+		}
+
+		return Boolean.FALSE;
+	}
+
+	/**
+	 * Set the compartment value.
+	 * 
+	 * @param domain The transactional editing domain.
+	 * @param rowElement The row element.
+	 * @param newValue The value to set.
+	 */
+	public void setCompartmentValue(final TransactionalEditingDomain domain, final Object rowElement, final Object newValue) {
+		Object row = AxisUtils.getRepresentedElement(rowElement);
+
+		// Depth 2
+		if (row instanceof Stereotype) {
+			Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent());
+			if (parent instanceof View) {
+				if (newValue instanceof Boolean) {
+					View compartment = helper.getStereotypeCompartment((View) parent, (Stereotype) row);
+					StereotypeDisplayCommandExecution.getInstance().setUserVisibility(domain, compartment, (Boolean) newValue);
+				}
+			}
+		}
+
+		// Depth 3
+		if (row instanceof Property) {
+			Object parent = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent().getParent().getParent().getParent().getParent());
+			Object stereo = AxisUtils.getRepresentedElement(((ITreeItemAxis) rowElement).getParent().getParent());
+
+			if (parent instanceof View) {
+				if (stereo instanceof Stereotype) {
+					if (newValue instanceof Boolean) {
+						View compartment = helper.getStereotypePropertyInCompartment((View) parent, (Stereotype) stereo, (Property) row);
+						StereotypeDisplayCommandExecution.getInstance().setUserVisibility(domain, compartment, (Boolean) newValue);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
index eb3b685876e..2d3f0ffe010 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.xml
@@ -75,6 +75,10 @@
             id="org.eclipse.papyrus.infra.uml.nattable.tree.axis.manager"
             manager="org.eclipse.papyrus.uml.nattable.manager.axis.UMLElementTreeAxisManagerForEventList">
       </axisManager>
+      <axisManager
+            id="org.eclipse.papyrus.uml.nattable.operation.axis.manager"
+            manager="org.eclipse.papyrus.uml.nattable.manager.axis.UMLOperationAxisManager">
+      </axisManager>
    </extension>
    <extension
          point="org.eclipse.papyrus.infra.nattable.cellmanager">
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLOperationAxisManager.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLOperationAxisManager.java
new file mode 100644
index 00000000000..9c608cbb9d7
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLOperationAxisManager.java
@@ -0,0 +1,57 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

+ * 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:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.uml.nattable.manager.axis;

+

+import org.eclipse.emf.ecore.EOperation;

+import org.eclipse.papyrus.infra.emf.nattable.manager.axis.EOperationAxisManager;

+import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;

+import org.eclipse.papyrus.uml.nattable.provider.UMLOperationRestrictedContentProvider;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @author Céline JANSSENS

+ *

+ */

+public class UMLOperationAxisManager extends EOperationAxisManager {

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.axis.EStructuralFeatureAxisManager#isAllowedContents(java.lang.Object)

+	 *

+	 * @param object

+	 * @return

+	 */

+	@Override

+	public boolean isAllowedContents(Object object) {

+		boolean value = super.isAllowedContents(object);

+		if (value) {

+			final EOperation operation = (EOperation) object;

+			value = operation.eContainer().eContainer() == UMLPackage.eINSTANCE;

+		}

+		return value;

+	}

+

+

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#createPossibleAxisContentProvider(boolean)

+	 *

+	 * @param isRestricted

+	 * @return

+	 */

+	@Override

+	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {

+		return new UMLOperationRestrictedContentProvider(this, isRestricted);

+	}

+}

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLOperationRestrictedContentProvider.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLOperationRestrictedContentProvider.java
new file mode 100644
index 00000000000..b7f25fafab4
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLOperationRestrictedContentProvider.java
@@ -0,0 +1,252 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

+ * 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:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.uml.nattable.provider;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashSet;

+import java.util.List;

+

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EClassifier;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EOperation;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EcorePackage;

+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

+import org.eclipse.papyrus.infra.widgets.providers.AbstractRestrictedContentProvider;

+import org.eclipse.papyrus.uml.nattable.manager.axis.UMLOperationAxisManager;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @author Céline JANSSENS

+ *

+ */

+public class UMLOperationRestrictedContentProvider extends AbstractRestrictedContentProvider {

+

+	/** the uml feature axis manager */

+	private final UMLOperationAxisManager axisManager;

+

+

+	/**

+	 *

+	 * Constructor.

+	 * boolean fields are initialized to false

+	 *

+	 * @param axisManager

+	 *            the axis manager used by this content provider

+	 */

+	public UMLOperationRestrictedContentProvider(final UMLOperationAxisManager axisManager) {

+		this(axisManager, false);

+	}

+

+

+	/**

+	 *

+	 * Constructor.

+	 * Inits {@link #ignoreInheritedFeatures} to true

+	 * others boolean fields are initialized to false

+	 *

+	 * @param axisManager

+	 *            the axis manager used by this content provider

+	 * @param isRestricted

+	 *            if <code>true</code> we return only elements accessible from the current contents of the table

+	 */

+	public UMLOperationRestrictedContentProvider(UMLOperationAxisManager axisManager, boolean isRestricted) {

+		super(isRestricted);

+		this.axisManager = axisManager;

+		setIgnoreInheritedElements(false);

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)

+	 *

+	 * @param inputElement

+	 * @return

+	 */

+	@Override

+	public Object[] getElements(Object inputElement) {

+		if (isRestricted()) {

+			final boolean columnManager = axisManager.isUsedAsColumnManager();

+			final List<?> elements;

+			if (columnManager) {

+				elements = this.axisManager.getTableManager().getRowElementsList();

+			} else {

+				elements = this.axisManager.getTableManager().getColumnElementsList();

+			}

+			if (elements.isEmpty()) {// we returns nothing in restricted mode when the table is empty

+				return new Object[0];

+			}

+		}

+		return new Object[] { UMLPackage.eINSTANCE };

+

+		// if(isRestricted() && elements.isEmpty()) {//we must returns nothing when the table is empty

+		// return new Object[0];

+		// } else {

+		// return this.axisManager.getAllPossibleAxis().toArray();

+		// }

+	}

+

+	/**

+	 *

+	 * @return

+	 */

+	protected AbstractAxisProvider getManagedAxisProvider() {

+		return this.axisManager.getRepresentedContentProvider();

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)

+	 *

+	 * @param parentElement

+	 * @return

+	 */

+	@Override

+	public Object[] getChildren(Object parentElement) {

+		List<Object> asList = new ArrayList<Object>();

+		if (parentElement instanceof EClass) {

+			EClass eClass = (EClass) parentElement;

+			if (isIgnoringInheritedElements()) {

+				asList.addAll(eClass.getEOperations());

+			} else {

+				asList.addAll(eClass.getEAllOperations());

+			}

+			asList.remove(EcorePackage.eINSTANCE.getEModelElement_EAnnotations());

+			return asList.toArray();

+		} else if (parentElement instanceof EPackage) {

+			EPackage ePackage = (EPackage) parentElement;

+			Collection<EClassifier> eClassifiers = null;

+			if (isRestricted()) {

+				eClassifiers = new HashSet<EClassifier>();

+				AbstractAxisProvider axisProvider = ((INattableModelManager) this.axisManager.getTableManager()).getHorizontalAxisProvider();

+				if (axisProvider == this.axisManager.getRepresentedContentProvider()) {

+					axisProvider = ((INattableModelManager) this.axisManager.getTableManager()).getVerticalAxisProvider();

+				}

+				boolean isColumnManager = this.axisManager.isUsedAsColumnManager();

+				final List<Object> elementsList;

+				if (isColumnManager) {

+					elementsList = this.axisManager.getTableManager().getRowElementsList();

+				} else {

+					elementsList = this.axisManager.getTableManager().getColumnElementsList();

+				}

+				for (Object object : elementsList) {

+					Object representedElement = AxisUtils.getRepresentedElement(object);

+					if (representedElement instanceof Element) {

+						EClass eClass = ((EObject) representedElement).eClass();

+						eClassifiers.add(eClass);

+						eClassifiers.addAll(eClass.getEAllSuperTypes());

+					}

+					// if (object instanceof EObject) {

+					// EObject eObject = (EObject) object;

+					// if (eObject instanceof EObjectAxis) {

+					// eObject = ((EObjectAxis) eObject).getElement();

+					// }

+					// EClass eClass = eObject.eClass();

+					// eClassifiers.add(eClass);

+					// eClassifiers.addAll(eClass.getEAllSuperTypes());

+					// }

+				}

+			} else {

+				eClassifiers = ePackage.getEClassifiers();

+			}

+			eClassifiers.remove(EcorePackage.eINSTANCE.getEModelElement());

+

+			for (EClassifier eClassifier : eClassifiers) {

+				if (eClassifier instanceof EClass && eClassifier != EcorePackage.eINSTANCE.getEModelElement()) {

+					asList.add(eClassifier);// we returns EClass with no EStructural feature too

+				}

+			}

+			return asList.toArray();

+		}

+		return null;

+

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

+	 *

+	 * @param element

+	 * @return

+	 */

+	@Override

+	public Object getParent(Object element) {

+		if (element instanceof EOperation) {

+			EOperation operation = (EOperation) element;

+			return operation.getEContainingClass();

+		} else if (element instanceof EClass) {

+			EClass eClass = (EClass) element;

+			return eClass.getEPackage();

+		}

+		return null;

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)

+	 *

+	 * @param element

+	 * @return

+	 */

+	@Override

+	public boolean hasChildren(Object element) {

+		if (element instanceof EClass) {

+			EClass eClass = (EClass) element;

+			boolean hasChildren = !eClass.getEOperations().isEmpty();

+			return hasChildren;

+		} else if (element instanceof EPackage) {

+			EPackage ePackage = (EPackage) element;

+			EList<EClassifier> eClassifiers = ePackage.getEClassifiers();

+			for (EClassifier eClassifier : eClassifiers) {

+				if (eClassifier instanceof EClass) {

+					return true;

+				}

+			}

+			return false;

+		} else if (element instanceof EOperation) {

+			return false;

+		}

+		return false;

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider#getElements()

+	 *

+	 * @return

+	 */

+	@Override

+	public Object[] getElements() {

+		return getElements(null);

+	}

+

+	/**

+	 *

+	 * @see org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider#isValidValue(java.lang.Object)

+	 *

+	 * @param element

+	 * @return

+	 *         <code>true</code> if the element is a UML Feature

+	 */

+	@Override

+	public boolean isValidValue(Object element) {

+		return element instanceof EOperation && UMLPackage.eINSTANCE.eContents().contains(((EObject) element).eContainer());

+	}

+}

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
index 49f7cefbd0d..ea755194ec9 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
@@ -51,7 +51,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.1.0"
+ org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.nattable;bundle-version="1.1.0",
+ org.eclipse.nebula.widgets.nattable.core;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.nattable;bundle-version="1.1.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.1.0.qualifier
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
index 89281fa422c..aac1b666f8d 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
@@ -94,6 +94,12 @@
       widgetClass="MultiplicityDialog"
       namespace="//@namespaces.0"
       type="Reference"/>
+  <propertyEditorTypes
+      label="Multi Reference Table"
+      widgetClass="NattablePropertyEditor"
+      namespace="//@namespaces.0"
+      type="Reference"
+      multiplicity="-1"/>
   <namespaces
       name="uml"
       value="org.eclipse.papyrus.uml.properties.widgets"/>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UMLNotation/ui/StereotypeDisplay.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UMLNotation/ui/StereotypeDisplay.xwt
index b3234b0120e..0bc2d31131f 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UMLNotation/ui/StereotypeDisplay.xwt
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UMLNotation/ui/StereotypeDisplay.xwt
@@ -1,32 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="3"

-				makeColumnsEqualWidth="true"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="StereotypeAppearance:StereotypeAppearance:stereotypeDisplay"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="StereotypeAppearance:StereotypeAppearance:textAlignment"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="StereotypeAppearance:StereotypeAppearance:displayPlace"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<uml:StereotypeDisplay input="{Binding}"

-			property="UMLNotation:Element:stereotypeDisplay"></uml:StereotypeDisplay>

-		<ppe:BooleanCheckbox input="{Binding}"

-			property="UMLNotation:Element:elementIcon"></ppe:BooleanCheckbox>

-		<ppe:BooleanCheckbox input="{Binding}"

-			property="UMLNotation:Element:shadow"></ppe:BooleanCheckbox>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<uml:NattablePropertyEditor
+			property="UMLNotation:Element:stereotypeDisplay"
+			tableURI="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotype.nattableconfiguration"
+			rowsAxisCategoriesHide="1,2,3"
+			input="{Binding}"></uml:NattablePropertyEditor>
+		<ppe:BooleanCheckbox input="{Binding}"
+			property="UMLNotation:Element:elementIcon"></ppe:BooleanCheckbox>
+		<ppe:BooleanCheckbox input="{Binding}"
+			property="UMLNotation:Element:shadow"></ppe:BooleanCheckbox>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java
new file mode 100644
index 00000000000..2aa997d59ee
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java
@@ -0,0 +1,402 @@
+/*****************************************************************************
+ * Copyright (c) 2015 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:
+ *  Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.properties.widgets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.papyrus.infra.emf.nattable.selection.EObjectSelectionExtractor;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;
+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.nattableaxis.IAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
+import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
+import org.eclipse.papyrus.infra.nattable.tree.ITreeItemAxisHelper;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NattableModelManagerFactory;
+import org.eclipse.papyrus.uml.properties.Activator;
+import org.eclipse.papyrus.uml.properties.modelelement.UMLNotationModelElement;
+import org.eclipse.papyrus.views.properties.contexts.Property;
+import org.eclipse.papyrus.views.properties.modelelement.CompositeModelElement;
+import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;
+import org.eclipse.papyrus.views.properties.modelelement.ModelElement;
+import org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ * The property editor for the nattable widget.
+ */
+public class NattablePropertyEditor extends AbstractPropertyEditor{
+
+	/**
+	 * The composite.
+	 */
+	private Composite self = null;;
+
+	/**
+	 * The table configuration URI.
+	 */
+	private URI tableConfigURI = null;
+	
+	/**
+	 * The row axis categories to hide.
+	 */
+	private List<Integer> rowsAxisCategoriesHide = null;
+	
+	/**
+	 * The columns axis categories to hide.
+	 */
+	private List<Integer> columnsAxisCategoriesHide = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent
+	 *            The parent composite.
+	 * @param style
+	 *            The style of the composite.
+	 */
+	public NattablePropertyEditor(final Composite parent, final int style) {
+		self = new Group(parent, SWT.NONE);
+		FillLayout fillLayout = new FillLayout();
+		fillLayout.marginHeight = 10;
+		fillLayout.marginWidth = 10;
+		self.setLayout(fillLayout);
+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		data.minimumHeight = 330;
+		self.setLayoutData(data);
+	}
+
+	/**
+	 * Set the table URI.
+	 * 
+	 * @param uri
+	 *            The URI of the table (as String).
+	 */
+	public void setTableURI(final String uri) {
+		tableConfigURI = URI.createURI(uri);
+		checkInput();
+	}
+
+	/**
+	 * Get the table configuration URI.
+	 * 
+	 * @return The table configuration URI.
+	 */
+	public String getTableURI() {
+		return tableConfigURI == null ? null : tableConfigURI.toString();
+	}
+	
+	/**
+	 * Set the rows axis categories to hide.
+	 * 
+	 * @param axis
+	 *            The axis to hide represented as String (separated by ",").
+	 */
+	public void setRowsAxisCategoriesHide(final String axis) {
+		rowsAxisCategoriesHide = new ArrayList<Integer>();
+		if(! axis.isEmpty()){
+			String[] multiAxis = axis.split(","); //$NON-NLS-1$
+			for(String oneAxis : multiAxis){
+				try{
+					rowsAxisCategoriesHide.add(Integer.parseInt(oneAxis));
+				}catch(final NumberFormatException e){
+					// Do nothing
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the rows axis categories to hide.
+	 * 
+	 * @return The rows axis categories to hide.
+	 */
+	public String getRowsAxisCategoriesHide() {
+		return rowsAxisCategoriesHide == null ? null : rowsAxisCategoriesHide.toString();
+	}
+	
+	/**
+	 * Set the rows axis categories to hide.
+	 * 
+	 * @param axis
+	 *            The axis to hide represented as String (separated by ",").
+	 */
+	public void setColumnsAxisCategoriesHide(final String axis) {
+		columnsAxisCategoriesHide = new ArrayList<Integer>();
+		if(! axis.isEmpty()){
+			String[] multiAxis = axis.split(","); //$NON-NLS-1$
+			for(String oneAxis : multiAxis){
+				try{
+					columnsAxisCategoriesHide.add(Integer.parseInt(oneAxis));
+				}catch(final NumberFormatException e){
+					// Do nothing
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the rows axis categories to hide.
+	 * 
+	 * @return The rows axis categories to hide.
+	 */
+	public String getColumnsAxisCategoriesHide() {
+		return columnsAxisCategoriesHide == null ? null : columnsAxisCategoriesHide.toString();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor#checkInput()
+	 */
+	@Override
+	protected void checkInput() {
+		if (tableConfigURI != null) {
+			super.checkInput();
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor#doBinding()
+	 */
+	@Override
+	protected void doBinding() {
+		super.doBinding();
+
+		// Configure the table
+		ModelElement modelElement = input.getModelElement(propertyPath);
+
+		Table table = null;
+		if(modelElement instanceof CompositeModelElement){
+			if(!((CompositeModelElement)modelElement).getSubElements().isEmpty()){
+				if(((CompositeModelElement)modelElement).getSubElements().get(0) instanceof UMLNotationModelElement){
+					EModelElement eModelElement = ((UMLNotationModelElement) ((CompositeModelElement)modelElement).getSubElements().get(0)).getEModelElement();
+					// Create a list of views to determinate the axis to display (cannot be created without the table editing domain)
+					final List<Object> views = new ArrayList<Object>();
+					for(ModelElement a : ((CompositeModelElement)modelElement).getSubElements()){
+						if(a instanceof UMLNotationModelElement){
+							views.add(((UMLNotationModelElement)a).getEModelElement());
+						}
+					}
+					table = createTable(eModelElement, null, views);
+					if (table == null) {
+						displayError("Cannot initialize the table"); //$NON-NLS-1$
+						return;
+					}
+				} else if (((CompositeModelElement)modelElement).getSubElements().get(0) instanceof EMFModelElement) {
+					EMFModelElement emfModelElement = (EMFModelElement) ((CompositeModelElement)modelElement).getSubElements().get(0);
+					EObject sourceElement = emfModelElement.getSource();
+					EStructuralFeature feature = emfModelElement.getFeature(getLocalPropertyPath());
+					
+					table = createTable(sourceElement, feature, null);
+					if (table == null) {
+						displayError("Cannot initialize the table"); //$NON-NLS-1$
+						return;
+					}
+				}
+			}
+		}else if (modelElement instanceof UMLNotationModelElement) {
+			EModelElement eModelElement = ((UMLNotationModelElement) modelElement).getEModelElement();
+			// Create a list of views to determinate the axis to display (cannot be created without the table editing domain)
+			final List<Object> views = new ArrayList<Object>();
+			views.add(eModelElement);
+			table = createTable(eModelElement, null, views);
+			if (table == null) {
+				displayError("Cannot initialize the table"); //$NON-NLS-1$
+				return;
+			}
+		} else if (modelElement instanceof EMFModelElement) {
+			EMFModelElement emfModelElement = (EMFModelElement) modelElement;
+			EObject sourceElement = emfModelElement.getSource();
+			EStructuralFeature feature = emfModelElement.getFeature(getLocalPropertyPath());
+
+			table = createTable(sourceElement, feature, null);
+			if (table == null) {
+				displayError("Cannot initialize the table"); //$NON-NLS-1$
+				return;
+			}
+		} else {
+			displayError("Invalid table context"); //$NON-NLS-1$
+			return;
+		}
+		
+		// Create the widget
+		final INattableModelManager nattableManager = NattableModelManagerFactory.INSTANCE.createNatTableModelManager(table, new EObjectSelectionExtractor());
+		NatTable widget = nattableManager.createNattable(self, SWT.NONE, null);
+		if (nattableManager instanceof TreeNattableModelManager) {
+			((TreeNattableModelManager) nattableManager).doCollapseExpandAction(CollapseAndExpandActionsEnum.EXPAND_ALL, null);
+			// Hide categories
+			((TreeNattableModelManager)nattableManager).hideShowRowCategories(rowsAxisCategoriesHide, columnsAxisCategoriesHide);
+		}
+		self.addDisposeListener(new DisposeListener() {
+
+			public void widgetDisposed(DisposeEvent e) {
+				nattableManager.dispose();
+			}
+		});
+
+		widget.setBackground(self.getBackground());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor#updateDescription(java.lang.String)
+	 */
+	@Override
+	protected void updateDescription(String description) {
+		self.setToolTipText(description);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor#updateLabel(java.lang.String)
+	 */
+	@Override
+	public void updateLabel(final String label) {
+		if (showLabel) {
+			((Group) self).setText(getLabel());
+		}
+	}
+
+	/**
+	 * This allow to display the error.
+	 * 
+	 * @param message
+	 *            The error mesage to display.
+	 */
+	protected void displayError(final String message) {
+		Label label = new Label(self, SWT.NONE);
+		label.setText(message);
+		label.setImage(org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("icons/error.gif")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This allow to create the nattable.
+	 * 
+	 * @param sourceElement
+	 *            The context element.
+	 * @param synchronizedFeature
+	 *            The synchronized feature.
+	 * @return The created nattable.
+	 */
+	protected Table createTable(final EObject sourceElement, final EStructuralFeature synchronizedFeature, final List<Object> views) {
+
+		final TableConfiguration tableConfiguration = getTableConfiguration();
+		if (tableConfiguration == null) {
+			return null;
+		}
+
+		Property property = getModelProperty();
+		final Table table = NattableFactory.eINSTANCE.createTable();
+
+		table.setTableConfiguration(tableConfiguration);
+		
+		if (property != null) {
+			String description = property.getDescription();
+			if (description != null) {
+				table.setDescription(description);
+			}
+		}
+
+		table.setName(getLabel());
+
+		AbstractAxisProvider rowProvider = tableConfiguration.getDefaultRowAxisProvider();
+		if (rowProvider == null) {
+			rowProvider = NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider();
+		} else {
+			rowProvider = EcoreUtil.copy(rowProvider);
+		}
+
+		AbstractAxisProvider columnProvider = tableConfiguration.getDefaultColumnAxisProvider();
+		if (columnProvider == null) {
+			columnProvider = NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider();
+		} else {
+			columnProvider = EcoreUtil.copy(columnProvider);
+		}
+
+		if(null != synchronizedFeature){
+			TableHeaderAxisConfiguration rowHeaderAxisconfig = tableConfiguration.getRowHeaderAxisConfiguration();
+			for (IAxisConfiguration axisConfig : rowHeaderAxisconfig.getOwnedAxisConfigurations()) {
+				if (axisConfig instanceof EStructuralFeatureValueFillingConfiguration) {
+					((EStructuralFeatureValueFillingConfiguration) axisConfig).setListenFeature(synchronizedFeature);
+				}
+			}
+		}
+
+		table.setCurrentColumnAxisProvider(columnProvider);
+		table.setCurrentRowAxisProvider(rowProvider);
+		
+		table.setContext(sourceElement);
+		
+		// Manage the construction of axis here because the table editing domain is null
+		if(null != views && !views.isEmpty()){
+			final AbstractAxisProvider axisProvider = table.getCurrentRowAxisProvider();
+			TableHeaderAxisConfiguration conf = (TableHeaderAxisConfiguration) HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);
+			AxisManagerRepresentation rep = conf.getAxisManagers().get(0);
+			for(Object view : views){
+				IAxis a = ITreeItemAxisHelper.createITreeItemAxis(null, null, view, rep);
+				axisProvider.getAxis().add(a);
+			}
+		}
+		
+		return table;
+	}
+
+	/**
+	 * Get the table configuration (from the table configuration URI).
+	 * 
+	 * @return The table configuration.
+	 */
+	protected TableConfiguration getTableConfiguration() {
+		ResourceSet resourceSet = new ResourceSetImpl();
+		try {
+			TableConfiguration tableConfiguration = (TableConfiguration) EMFHelper.loadEMFModel(resourceSet,
+					tableConfigURI);
+			return tableConfiguration;
+		} catch (Exception ex) {
+			Activator.log.error("Invalid table configuration", ex); //$NON-NLS-1$
+		}
+
+		return null;
+	}
+	
+}